From d71b9594fe5c84df44c3048042e714cd0d06f2d3 Mon Sep 17 00:00:00 2001 From: Keegan McAllister Date: Sat, 27 Oct 2012 11:22:13 -0400 Subject: [PATCH] Configure nginx for the new server (imported from commit d073276912ea844e75fd710689f152fd7a2213c7) --- servers/puppet/files/nginx/sites-available/humbug | 4 ++-- zephyr/static/html/5xx.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/servers/puppet/files/nginx/sites-available/humbug b/servers/puppet/files/nginx/sites-available/humbug index 5ab58849dd..cb2816ca69 100644 --- a/servers/puppet/files/nginx/sites-available/humbug +++ b/servers/puppet/files/nginx/sites-available/humbug @@ -1,6 +1,6 @@ server { listen 80; - server_name app.humbughq.com; + server_name humbughq.com; return 301 https://$server_name$request_uri; } @@ -11,7 +11,7 @@ server { ssl_certificate /etc/ssl/certs/app.humbughq.com.combined-chain.crt; ssl_certificate_key /etc/ssl/private/app.humbughq.com.key; - server_name app.humbughq.com; + server_name humbughq.com; access_log /var/log/nginx/humbug.access.log; error_log /var/log/nginx/humbug.error.log; diff --git a/zephyr/static/html/5xx.html b/zephyr/static/html/5xx.html index b0455885ce..b7dbb8efc5 100644 --- a/zephyr/static/html/5xx.html +++ b/zephyr/static/html/5xx.html @@ -8,7 +8,7 @@ - +