From 1be1cb121cf3d45626bb7ae9f795e3ef81338a54 Mon Sep 17 00:00:00 2001
From: Luke Faraone <lfaraone@humbughq.com>
Date: Tue, 2 Jul 2013 11:44:40 -0400
Subject: [PATCH] nginx / Puppet configuration for staging.zulip.com

We create a new sites-available entry which is essentially a duplicate of
sites-available/humbug-staging with s/humbug/zulip, and add the associated
symlink directive in Puppet.

(imported from commit febcb585ce93c21c6849d96458cc2bd096b30538)
---
 .../files/nginx/sites-available/zulip-staging | 20 +++++++++++++++++++
 .../humbug/manifests/staging_app_frontend.pp  |  4 ++++
 2 files changed, 24 insertions(+)
 create mode 100644 servers/puppet/modules/humbug/files/nginx/sites-available/zulip-staging

diff --git a/servers/puppet/modules/humbug/files/nginx/sites-available/zulip-staging b/servers/puppet/modules/humbug/files/nginx/sites-available/zulip-staging
new file mode 100644
index 0000000000..0c62b66227
--- /dev/null
+++ b/servers/puppet/modules/humbug/files/nginx/sites-available/zulip-staging
@@ -0,0 +1,20 @@
+server {
+    listen 80;
+    server_name staging.zulip.com;
+    return 301 https://$server_name$request_uri;
+}
+
+server {
+    listen 443;
+
+    ssl on;
+    ssl_certificate /etc/ssl/certs/staging.zulip.com.combined-chain.crt;
+    ssl_certificate_key /etc/ssl/private/staging_and_dev.humbughq.com.key;
+
+    server_name staging.zulip.com;
+
+    # Avoid clickjacking attacks
+    add_header X-Frame-Options DENY;
+
+    include /etc/nginx/humbug-include/app;
+}
diff --git a/servers/puppet/modules/humbug/manifests/staging_app_frontend.pp b/servers/puppet/modules/humbug/manifests/staging_app_frontend.pp
index ffd3ddac9e..509bb36229 100644
--- a/servers/puppet/modules/humbug/manifests/staging_app_frontend.pp
+++ b/servers/puppet/modules/humbug/manifests/staging_app_frontend.pp
@@ -13,5 +13,9 @@ class humbug::staging_app_frontend {
     ensure => 'link',
     target => '/etc/nginx/sites-available/humbug-staging',
   }
+  file { '/etc/nginx/sites-enabled/zulip-staging':
+    ensure => 'link',
+    target => '/etc/nginx/sites-available/zulip-staging',
+  }
 
 }