paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add zulip.customer29.invalid host.

Browse Source 
(imported from commit ea3e7bb465c920b8ec21b7471cd261868f5059e7)
This commit is contained in:
Tim Abbott
2013-12-09 15:59:45 -05:00
parent c21e85e569
commit 73f04b21e9
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
puppet/zulip_internal/files/nginx/sites-available/loadbalancer
View File

@@ -133,6 +133,29 @@ server {
}
}
server {
listen customer29.zulip.com:443;
ssl on;
ssl_certificate /etc/ssl/certs/customer29.zulip.com.combined-chain.crt;
ssl_certificate_key /etc/ssl/private/app.humbughq.com.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 external-content.zulipcdn.net:443;

16
puppet/zulip_internal/files/nginx/sites-available/zulip
View File

@@ -30,6 +30,22 @@ server {
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 customer29.zulip.com;
## We need to support running Zulip in an iframe for this
## application, so X-Frame-Options is not set.
# add_header X-Frame-Options DENY;
include /etc/nginx/zulip-include/app;
}
server {
listen 443;