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

puppet: Disable proxy_next_upstream feature in nginx config. 

(imported from commit 84cad76701f9ee40fa9601ae06b3f804948b96d4)
This commit is contained in:
Tim Abbott 2013-12-03 14:27:04 -05:00
parent 30eaae72e4
commit 850eae3e8e
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
puppet/zulip/files/nginx/zulip-include/app
View File

@ -22,6 +22,7 @@ location ~ /json/get_events|/json/events|/api/v1/events {
proxy_buffering off; proxy_buffering off;
proxy_read_timeout 1200; proxy_read_timeout 1200;
proxy_next_upstream off;
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@ -30,6 +31,7 @@ location ~ /json/get_events|/json/events|/api/v1/events {
# Send sockjs requests to Tornado # Send sockjs requests to Tornado
location /sockjs { location /sockjs {
proxy_pass http://localhost:9993; proxy_pass http://localhost:9993;
proxy_next_upstream off;
include /etc/nginx/zulip-include/location-sockjs; include /etc/nginx/zulip-include/location-sockjs;
} }
@ -41,6 +43,7 @@ location / {
# Second number set to `getconf PAGESIZE` # Second number set to `getconf PAGESIZE`
fastcgi_buffers 1024 4k; fastcgi_buffers 1024 4k;
fastcgi_max_temp_file_size 0; fastcgi_max_temp_file_size 0;
fastcgi_next_upstream off;
} }
include /etc/nginx/zulip-include/app.d/*.conf; include /etc/nginx/zulip-include/app.d/*.conf;

1
puppet/zulip_internal/files/nginx/zulip-include/loadbalancer
View File

@ -1,2 +1,3 @@
proxy_set_header Host $host; proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-For $remote_addr;
proxy_next_upstream off;