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

puppet: Move HTTP_X_REAL_IP setting into uwsgi_params.

Browse Source 
This effectively also adds it to serving `/user_uploads`, where its
lack would cause failures to list the actual IP address.
This commit is contained in:
Alex Vandiver
2021-04-07 15:21:30 -07:00
committed by Tim Abbott
parent 795517bd52
commit 9cf9d5f2cf
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
puppet/zulip/files/nginx/uwsgi_params
View File

@@ -13,3 +13,4 @@ uwsgi_param REMOTE_PORT $remote_port;
uwsgi_param SERVER_ADDR $server_addr; uwsgi_param SERVER_ADDR $server_addr;
uwsgi_param SERVER_PORT $server_port; uwsgi_param SERVER_PORT $server_port;
uwsgi_param SERVER_NAME $server_name; uwsgi_param SERVER_NAME $server_name;
uwsgi_param HTTP_X_REAL_IP $remote_addr;

4
puppet/zulip/files/nginx/zulip-include-frontend/app
View File

@@ -48,7 +48,6 @@ location /api/v1/events {
# Send everything else to Django via uWSGI # Send everything else to Django via uWSGI
location / { location / {
include uwsgi_params; include uwsgi_params;
uwsgi_param HTTP_X_REAL_IP $remote_addr;
uwsgi_pass django; uwsgi_pass django;
} }
@@ -62,14 +61,12 @@ location /thumbnail {
include /etc/nginx/zulip-include/api_headers; include /etc/nginx/zulip-include/api_headers;
include uwsgi_params; include uwsgi_params;
uwsgi_param HTTP_X_REAL_IP $remote_addr;
uwsgi_pass django; uwsgi_pass django;
} }
location /avatar { location /avatar {
include /etc/nginx/zulip-include/api_headers; include /etc/nginx/zulip-include/api_headers;
include uwsgi_params; include uwsgi_params;
uwsgi_param HTTP_X_REAL_IP $remote_addr;
uwsgi_pass django; uwsgi_pass django;
} }
@@ -78,7 +75,6 @@ location /api/ {
include /etc/nginx/zulip-include/api_headers; include /etc/nginx/zulip-include/api_headers;
include uwsgi_params; include uwsgi_params;
uwsgi_param HTTP_X_REAL_IP $remote_addr;
uwsgi_pass django; uwsgi_pass django;
} }