From e8f63e2041e3b4ff7b97feb5e9abd72de33ebc29 Mon Sep 17 00:00:00 2001 From: Luke Faraone Date: Thu, 5 Feb 2015 17:44:31 -0800 Subject: [PATCH] [manual] external-content now shares www IP This is safe because we have the wildcard-all cert. DEPLOY INSTRUCTIONS: Change the CNAME in R53 for external-content.zulipcdn.net to the same as www.zulip.com (imported from commit 075984943ce3a3b17518b913ea650992e45f705e) --- .../zulip_internal/files/nginx/sites-available/loadbalancer | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/puppet/zulip_internal/files/nginx/sites-available/loadbalancer b/puppet/zulip_internal/files/nginx/sites-available/loadbalancer index 8b982539e9..d9dc5b977c 100644 --- a/puppet/zulip_internal/files/nginx/sites-available/loadbalancer +++ b/puppet/zulip_internal/files/nginx/sites-available/loadbalancer @@ -147,7 +147,9 @@ server { } server { - listen external-content.zulipcdn.net:443; + listen www.zulip.com:443; + server_name external-content.zulipcdn.net; + ssl on; ssl_certificate /etc/ssl/certs/wildcard-all.combined-chain.crt;