Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

zulip_ops: Remove unnecessary loadbalancer stanzas.

This commit is contained in:
Tim Abbott 2016-07-18 18:04:45 -07:00 committed by Tim Abbott
parent 624ee3989f
commit 8584c05d80
1 changed files with 0 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
puppet/zulip_ops/files/nginx/sites-available/loadbalancer
View File

@ -4,24 +4,12 @@ upstream staging {
keepalive 10000; keepalive 10000;
} }
upstream alpha {
server alpha0.zulip.net:443;
keepalive 10000;
}
upstream prod { upstream prod {
server prod0.zulip.net:443; server prod0.zulip.net:443;
keepalive 10000; keepalive 10000;
} }
upstream dbx {
server dbx.zulip.net:443;
keepalive 10000;
}
server { server {
listen 80; listen 80;
return 301 https://$host$request_uri; 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 { server {
listen www.zulip.com:443; listen www.zulip.com:443;
server_name external-content.zulipcdn.net; server_name external-content.zulipcdn.net;
@ -136,34 +76,3 @@ server {
include /etc/nginx/zulip-include/proxy; 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/;
}
}