From 6826ef4e9a1f52dc7eaae59b74f9bce0b560fa81 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulip.com>
Date: Fri, 15 Nov 2013 10:20:30 -0500
Subject: [PATCH] puppet: Switch from nginx to nginx-full.

(imported from commit 38dd5966d75946842b39e4e619d82ebbb0fb041c)
---
 puppet/zulip/manifests/app_frontend.pp                  | 2 +-
 puppet/zulip/manifests/enterprise.pp                    | 2 +-
 puppet/zulip/manifests/localhost_sso.pp                 | 2 +-
 puppet/zulip/manifests/nginx.pp                         | 8 ++++----
 puppet/zulip_internal/manifests/loadbalancer.pp         | 4 ++--
 puppet/zulip_internal/manifests/prod_app_frontend.pp    | 2 +-
 puppet/zulip_internal/manifests/staging_app_frontend.pp | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/puppet/zulip/manifests/app_frontend.pp b/puppet/zulip/manifests/app_frontend.pp
index 8e4c75ef71..80f54215e8 100644
--- a/puppet/zulip/manifests/app_frontend.pp
+++ b/puppet/zulip/manifests/app_frontend.pp
@@ -66,7 +66,7 @@ class zulip::app_frontend {
   safepackage { $web_packages: ensure => "installed" }
 
   file { "/etc/nginx/zulip-include/":
-    require => Package[nginx],
+    require => Package["nginx-full"],
     recurse => true,
     owner  => "root",
     group  => "root",
diff --git a/puppet/zulip/manifests/enterprise.pp b/puppet/zulip/manifests/enterprise.pp
index a62c2abd92..7ec53a60d6 100644
--- a/puppet/zulip/manifests/enterprise.pp
+++ b/puppet/zulip/manifests/enterprise.pp
@@ -13,7 +13,7 @@ class zulip::enterprise {
   }
 
   file { "/etc/nginx/sites-available/zulip-enterprise":
-    require => Package[nginx],
+    require => Package["nginx-full"],
     ensure => file,
     owner  => "root",
     group  => "root",
diff --git a/puppet/zulip/manifests/localhost_sso.pp b/puppet/zulip/manifests/localhost_sso.pp
index 6cadf404af..0b12aa7bed 100644
--- a/puppet/zulip/manifests/localhost_sso.pp
+++ b/puppet/zulip/manifests/localhost_sso.pp
@@ -1,6 +1,6 @@
 class zulip::localhost_sso {
   file { "/etc/nginx/zulip-include/app.d/external-sso.conf":
-    require => Package[nginx],
+    require => Package["nginx-full"],
     ensure => file,
     owner  => "root",
     group  => "root",
diff --git a/puppet/zulip/manifests/nginx.pp b/puppet/zulip/manifests/nginx.pp
index b104e28f19..4c4f3a168d 100644
--- a/puppet/zulip/manifests/nginx.pp
+++ b/puppet/zulip/manifests/nginx.pp
@@ -1,11 +1,11 @@
 class zulip::nginx {
-  $web_packages = [# Needed to run nginx
-                   "nginx",
+  $web_packages = [# Needed to run nginx with the modules we use
+                   "nginx-full",
                    ]
   package { $web_packages: ensure => "installed" }
 
   file { "/etc/nginx/nginx.conf":
-    require => Package[nginx],
+    require => Package["nginx-full"],
     ensure => file,
     owner  => "root",
     group  => "root",
@@ -15,7 +15,7 @@ class zulip::nginx {
   }
 
   file { "/etc/nginx/fastcgi_params":
-    require => Package[nginx],
+    require => Package["nginx-full"],
     ensure => file,
     owner  => "root",
     group  => "root",
diff --git a/puppet/zulip_internal/manifests/loadbalancer.pp b/puppet/zulip_internal/manifests/loadbalancer.pp
index d92440dbe0..c13d70e051 100644
--- a/puppet/zulip_internal/manifests/loadbalancer.pp
+++ b/puppet/zulip_internal/manifests/loadbalancer.pp
@@ -4,7 +4,7 @@ class zulip_internal::loadbalancer {
   include zulip::camo
 
   file { "/etc/nginx/zulip-include/":
-    require => Package[nginx],
+    require => Package["nginx-full"],
     recurse => true,
     owner  => "root",
     group  => "root",
@@ -14,7 +14,7 @@ class zulip_internal::loadbalancer {
   }
 
   file { "/etc/nginx/sites-available/loadbalancer":
-    require => Package[nginx],
+    require => Package["nginx-full"],
     ensure => file,
     owner  => "root",
     group  => "root",
diff --git a/puppet/zulip_internal/manifests/prod_app_frontend.pp b/puppet/zulip_internal/manifests/prod_app_frontend.pp
index f0251d7f86..e4c136af33 100644
--- a/puppet/zulip_internal/manifests/prod_app_frontend.pp
+++ b/puppet/zulip_internal/manifests/prod_app_frontend.pp
@@ -3,7 +3,7 @@ class zulip_internal::prod_app_frontend {
   include zulip_internal::app_frontend
 
   file { "/etc/nginx/sites-available/zulip":
-    require => Package[nginx],
+    require => Package["nginx-full"],
     ensure => file,
     owner  => "root",
     group  => "root",
diff --git a/puppet/zulip_internal/manifests/staging_app_frontend.pp b/puppet/zulip_internal/manifests/staging_app_frontend.pp
index d262cd993f..0f88df3e64 100644
--- a/puppet/zulip_internal/manifests/staging_app_frontend.pp
+++ b/puppet/zulip_internal/manifests/staging_app_frontend.pp
@@ -3,7 +3,7 @@ class zulip_internal::staging_app_frontend {
   include zulip_internal::app_frontend
 
   file { "/etc/nginx/sites-available/zulip-staging":
-    require => Package[nginx],
+    require => Package["nginx-full"],
     ensure => file,
     owner  => "root",
     group  => "root",