From 5de6b879b7828bb072043508bc052cda0c4c7dec Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulip.com>
Date: Sun, 10 Nov 2013 09:58:10 -0500
Subject: [PATCH] puppet: Move minify-js and statsd dependencies to internal
 manifest.

(imported from commit 3363fb962a4fde575591b42db888b92bb6edd0f5)
---
 puppet/zulip/manifests/app_frontend.pp                |  4 ----
 puppet/zulip_internal/manifests/app_frontend.pp       | 11 +++++++++++
 puppet/zulip_internal/manifests/prod_app_frontend.pp  |  2 +-
 .../zulip_internal/manifests/staging_app_frontend.pp  |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 puppet/zulip_internal/manifests/app_frontend.pp

diff --git a/puppet/zulip/manifests/app_frontend.pp b/puppet/zulip/manifests/app_frontend.pp
index ad8b8ad770..174b65cc31 100644
--- a/puppet/zulip/manifests/app_frontend.pp
+++ b/puppet/zulip/manifests/app_frontend.pp
@@ -13,7 +13,6 @@ class zulip::app_frontend {
                     "python-django-jstemplate",
                     "python-django-guardian",
                     "python-django-auth-openid",
-                    "python-django-statsd-mozilla",
                     "python-django-south",
                     "python-django-pipeline",
                     "python-django-bitfield",
@@ -41,9 +40,6 @@ class zulip::app_frontend {
                     "python-pika",
                     # Needed for timezone work
                     "python-tz",
-                    # Needed for minify-js
-                    "yui-compressor",
-                    "nodejs",
                     # Needed to parse source maps for error reporting
                     "python-sourcemap",
                     # Needed for redis
diff --git a/puppet/zulip_internal/manifests/app_frontend.pp b/puppet/zulip_internal/manifests/app_frontend.pp
new file mode 100644
index 0000000000..e1c20a8531
--- /dev/null
+++ b/puppet/zulip_internal/manifests/app_frontend.pp
@@ -0,0 +1,11 @@
+class zulip_internal::app_frontend {
+  include zulip::app_frontend
+  $app_packages = [# Needed for minify-js
+                   "yui-compressor",
+                   "nodejs",
+                   # Needed for statsd reporting
+                   "python-django-statsd-mozilla",
+                   ]
+  package { $app_packages: ensure => "installed" }
+
+}
diff --git a/puppet/zulip_internal/manifests/prod_app_frontend.pp b/puppet/zulip_internal/manifests/prod_app_frontend.pp
index a946c0e62f..d7e47e486b 100644
--- a/puppet/zulip_internal/manifests/prod_app_frontend.pp
+++ b/puppet/zulip_internal/manifests/prod_app_frontend.pp
@@ -1,6 +1,6 @@
 class zulip_internal::prod_app_frontend {
   include zulip_internal::base
-  include zulip::app_frontend
+  include zulip_internal::app_frontend
 
   file { "/etc/nginx/sites-available/zulip":
     require => Package[nginx],
diff --git a/puppet/zulip_internal/manifests/staging_app_frontend.pp b/puppet/zulip_internal/manifests/staging_app_frontend.pp
index c41813bc43..d262cd993f 100644
--- a/puppet/zulip_internal/manifests/staging_app_frontend.pp
+++ b/puppet/zulip_internal/manifests/staging_app_frontend.pp
@@ -1,6 +1,6 @@
 class zulip_internal::staging_app_frontend {
   include zulip_internal::base
-  include zulip::app_frontend
+  include zulip_internal::app_frontend
 
   file { "/etc/nginx/sites-available/zulip-staging":
     require => Package[nginx],