puppet: Fix nginx upstreams for staging.

(imported from commit eb1e6e3b2d35533af4a24015a91201e2414f8e28)

puppet/zulip/files/nginx/sites-available/zulip-enterprise

@@ -2,6 +2,9 @@ server {
     listen 80;
     return 301 https://$host$request_uri;
 }
+
+include /etc/nginx/zulip-include/upstreams;
+
 server {
     listen 443;
 

puppet/zulip/files/nginx/zulip-include-frontend/upstreams

@@ -0,0 +1,12 @@
+upstream django {
+    server unix:/home/zulip/deployments/fastcgi-socket;
+}
+
+upstream tornado {
+    server localhost:9993;
+    keepalive 10000;
+}
+
+upstream localhost_sso {
+    server localhost:8888;
+}

puppet/zulip/manifests/app_frontend.pp

@@ -76,6 +76,14 @@ class zulip::app_frontend {
     source => "puppet:///modules/zulip/nginx/zulip-include-frontend/app",
     notify => Service["nginx"],
   }
+  file { "/etc/nginx/zulip-include/upstreams":
+    require => Package["nginx-full"],
+    owner  => "root",
+    group  => "root",
+    mode => 644,
+    source => "puppet:///modules/zulip/nginx/zulip-include-frontend/upstreams",
+    notify => Service["nginx"],
+  }
   file { "/etc/nginx/zulip-include/app.d/":
     ensure => directory,
     owner => "root",

puppet/zulip_internal/files/nginx/sites-available/zulip

@@ -14,18 +14,7 @@ server {
     return 301 https://$host$request_uri;
 }
 
-upstream django {
+include /etc/nginx/zulip-include/upstreams;
-    server_name unix:/home/zulip/deployments/fastcgi-socket;
-}
-
-upstream tornado {
-    server_name localhost:9993;
-    keepalive 10000;
-}
-
-upstream localhost_sso {
-    server_name localhost:8888;
-}
 
 server {
     listen 443;

puppet/zulip_internal/files/nginx/sites-available/zulip-staging

@@ -4,6 +4,8 @@ server {
     return 301 https://$server_name$request_uri;
 }
 
+include /etc/nginx/zulip-include/upstreams;
+
 server {
     listen 443;