diff --git a/puppet/zulip_ops/files/nginx/sites-available/loadbalancer b/puppet/zulip_ops/files/nginx/sites-available/loadbalancer index c70ee5b697..5574c7e2ac 100644 --- a/puppet/zulip_ops/files/nginx/sites-available/loadbalancer +++ b/puppet/zulip_ops/files/nginx/sites-available/loadbalancer @@ -27,30 +27,6 @@ server { return 301 https://$host$request_uri; } -server { - listen www.humbughq.com:443; - server_name www.humbughq.com api.humbughq.com humbughq.com; - - ssl on; - ssl_certificate /etc/ssl/certs/wildcard-all.combined-chain.crt; - ssl_certificate_key /etc/ssl/private/wildcard-all.key; - - location / { - proxy_pass https://prod; - include /etc/nginx/zulip-include/proxy; - } - - location /sockjs { - proxy_pass https://prod; - include /etc/nginx/zulip-include/location-sockjs; - } - - location ~ /json/get_events|/json/events|/api/v1/events { - proxy_pass https://prod; - include /etc/nginx/zulip-include/proxy_longpolling; - } -} - server { listen staging.zulip.com:443; diff --git a/puppet/zulip_ops/files/nginx/sites-available/zulip b/puppet/zulip_ops/files/nginx/sites-available/zulip index c7dc3e2ec8..ae176fdf5a 100644 --- a/puppet/zulip_ops/files/nginx/sites-available/zulip +++ b/puppet/zulip_ops/files/nginx/sites-available/zulip @@ -1,19 +1,3 @@ -# Redirect http://app.humbughq.com and other unsupported -# hostnames to https://humbughq.com -# -# We don't have a redirect for HTTPS, however. -server { - listen 80 default_server; - server_name app.humbughq.com; - return 301 https://humbughq.com; -} - -server { - listen 80; - server_name humbughq.com zephyr.humbughq.com; - return 301 https://$host$request_uri; -} - include /etc/nginx/zulip-include/upstreams; server { @@ -21,25 +5,13 @@ server { ssl on; - ssl_certificate /etc/ssl/certs/wildcard-humbughq.com.combined-chain.crt; - ssl_certificate_key /etc/ssl/private/app.humbughq.com.key; + ssl_certificate /etc/ssl/certs/wildcard-zulipchat.com.combined-chain.crt; + ssl_certificate_key /etc/ssl/private/wildcard-zulipchat.com.key; - server_name zephyr.humbughq.com zephyr.zulip.com; - - include /etc/nginx/zulip-include/app; -} - -server { - listen 443; - - ssl on; - - ssl_certificate /etc/ssl/certs/wildcard-humbughq.com.combined-chain.crt; - ssl_certificate_key /etc/ssl/private/app.humbughq.com.key; - - # We don't actually have an SSL cert for zulip.com, but that's okay since - # clients will never be accessing this host directly. - server_name humbughq.com www.humbughq.com zulip.com www.zulip.com; + # We don't actually have an SSL cert for zulipchat.com on this + # machine, but that's okay since clients will never be accessing + # this host directly. + server_name zulipchat.com; # Downloadable software location /dist/ { @@ -47,31 +19,5 @@ server { alias /srv/www/dist/; } - # Voyager downloads - location /enterprise/ { - alias /srv/www/enterprise/; - autoindex on; - - location /enterprise/download { - alias /srv/www/enterprise/download; - auth_basic "Password needed"; - auth_basic_user_file /srv/www/enterprise/download/.htpasswd; - } - } - - include /etc/nginx/zulip-include/app; -} - -server { - listen 443; - - ssl on; - ssl_certificate /etc/ssl/certs/wildcard-humbughq.com.combined-chain.crt; - ssl_certificate_key /etc/ssl/private/app.humbughq.com.key; - - server_name api.humbughq.com api.zulip.com; - - rewrite ^/(.*) /api/$1 break; - include /etc/nginx/zulip-include/app; }