From 8584c05d807d4df1b97616567d298b5e0c06b14e Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Mon, 18 Jul 2016 18:04:45 -0700 Subject: [PATCH] zulip_ops: Remove unnecessary loadbalancer stanzas. --- .../files/nginx/sites-available/loadbalancer | 91 ------------------- 1 file changed, 91 deletions(-) diff --git a/puppet/zulip_ops/files/nginx/sites-available/loadbalancer b/puppet/zulip_ops/files/nginx/sites-available/loadbalancer index 5574c7e2ac..c67d9eb4c4 100644 --- a/puppet/zulip_ops/files/nginx/sites-available/loadbalancer +++ b/puppet/zulip_ops/files/nginx/sites-available/loadbalancer @@ -4,24 +4,12 @@ upstream staging { keepalive 10000; } -upstream alpha { - server alpha0.zulip.net:443; - - keepalive 10000; -} - upstream prod { server prod0.zulip.net:443; keepalive 10000; } -upstream dbx { - server dbx.zulip.net:443; - - keepalive 10000; -} - server { listen 80; return 301 https://$host$request_uri; @@ -74,54 +62,6 @@ server { } } -server { - listen api.zulip.com:443; - - 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; - } - - # On api.zulip.com, there's an automatic leading /api - location ~ /v1/events { - proxy_pass https://prod; - include /etc/nginx/zulip-include/proxy_longpolling; - } -} - - -server { - listen zephyr.zulip.com:443; - - 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 www.zulip.com:443; server_name external-content.zulipcdn.net; @@ -136,34 +76,3 @@ server { include /etc/nginx/zulip-include/proxy; } } - -server { - listen chat.dropboxer.net:443; - - ssl on; - ssl_certificate /etc/ssl/certs/chat.dropboxer.net.combined-chain.crt; - ssl_certificate_key /etc/ssl/private/chat.dropboxer.net.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; - } - - location = /accounts/login/ { - return 302 /accounts/login/google/; - } - - location /login/ { - return 302 /accounts/login/google/; - } -}