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

zulip_ops: Remove humbughq.com nginx configuration. 

The humbughq.com name hasn't been the product's name since 2013, and
it's nice to finish clearing it out of the repository.
This commit is contained in:
Tim Abbott 2016-10-16 19:16:06 -07:00
parent 29448fb47b
commit 869f0724ce
2 changed files with 6 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,30 +27,6 @@ server {
return 301 https://$host$request_uri; 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 { server {
listen staging.zulip.com:443; listen staging.zulip.com:443;

66
puppet/zulip_ops/files/nginx/sites-available/zulip
View File

@ -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; include /etc/nginx/zulip-include/upstreams;
server { server {
@ -21,25 +5,13 @@ server {
ssl on; ssl on;
ssl_certificate /etc/ssl/certs/wildcard-humbughq.com.combined-chain.crt; ssl_certificate /etc/ssl/certs/wildcard-zulipchat.com.combined-chain.crt;
ssl_certificate_key /etc/ssl/private/app.humbughq.com.key; ssl_certificate_key /etc/ssl/private/wildcard-zulipchat.com.key;
server_name zephyr.humbughq.com zephyr.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
include /etc/nginx/zulip-include/app; # this host directly.
} server_name zulipchat.com;
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;
# Downloadable software # Downloadable software
location /dist/ { location /dist/ {
@ -47,31 +19,5 @@ server {
alias /srv/www/dist/; 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; include /etc/nginx/zulip-include/app;
} }