From 43e1c5e47ddedb94b5ddf52dc2e8d7ecc74a3f32 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulip.com>
Date: Fri, 8 Nov 2013 15:19:51 -0500
Subject: [PATCH] puppet: Move our camo installation setup to its own manifest.

(imported from commit 401018c3ff49fea485c3c8b4adb42574bb0b54b0)
---
 puppet/zulip/manifests/camo.pp                  | 11 +++++++++++
 puppet/zulip/manifests/local_server.pp          |  1 +
 puppet/zulip_internal/manifests/loadbalancer.pp |  8 +-------
 3 files changed, 13 insertions(+), 7 deletions(-)
 create mode 100644 puppet/zulip/manifests/camo.pp

diff --git a/puppet/zulip/manifests/camo.pp b/puppet/zulip/manifests/camo.pp
new file mode 100644
index 0000000000..8f6a17fa97
--- /dev/null
+++ b/puppet/zulip/manifests/camo.pp
@@ -0,0 +1,11 @@
+class zulip::camo {
+  $camo_packages = [# Needed for camo
+                    "nodejs",
+                    "camo",
+                    ]
+  package { $camo_packages: ensure => "installed" }
+
+  # The configuration file is generated at install time
+}
+
+
diff --git a/puppet/zulip/manifests/local_server.pp b/puppet/zulip/manifests/local_server.pp
index f6d3bfb3c1..299d631bc6 100644
--- a/puppet/zulip/manifests/local_server.pp
+++ b/puppet/zulip/manifests/local_server.pp
@@ -2,6 +2,7 @@ class zulip::local_server {
   include zulip::base
   include zulip::app_frontend
   include zulip::postgres_appdb
+  include zulip::camo
 
   file { "/etc/nginx/sites-available/zulip-local":
     require => Package[nginx],
diff --git a/puppet/zulip_internal/manifests/loadbalancer.pp b/puppet/zulip_internal/manifests/loadbalancer.pp
index e198513612..d92440dbe0 100644
--- a/puppet/zulip_internal/manifests/loadbalancer.pp
+++ b/puppet/zulip_internal/manifests/loadbalancer.pp
@@ -1,6 +1,7 @@
 class zulip_internal::loadbalancer {
   include zulip_internal::base
   include zulip::nginx
+  include zulip::camo
 
   file { "/etc/nginx/zulip-include/":
     require => Package[nginx],
@@ -34,13 +35,6 @@ class zulip_internal::loadbalancer {
     target => '/etc/nginx/sites-available/loadbalancer',
   }
 
-  # Config for Camo
-  $camo_packages = [# Packages needed to run camo
-                    "camo",
-                    "nodejs",
-                    ]
-  package { $camo_packages: ensure => "installed" }
-
   file { "/etc/default/camo":
     require => Package[camo],
     ensure => file,