Most proxy settings can be global

This commit is contained in:
Mark Felder 2020-09-21 16:13:45 -05:00
parent 2b553b8f8e
commit ade7fede71
1 changed files with 6 additions and 15 deletions

View File

@ -65,13 +65,13 @@ server {
client_max_body_size 16m; client_max_body_size 16m;
ignore_invalid_headers off; ignore_invalid_headers off;
location / { proxy_http_version 1.1;
proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade";
proxy_set_header Connection "upgrade"; proxy_set_header Host $http_host;
proxy_set_header Host $http_host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
location / {
# this is explicitly IPv4 since Pleroma.Web.Endpoint binds on IPv4 only # this is explicitly IPv4 since Pleroma.Web.Endpoint binds on IPv4 only
# and `localhost.` resolves to [::0] on some systems: see issue #930 # and `localhost.` resolves to [::0] on some systems: see issue #930
proxy_pass http://127.0.0.1:4000; proxy_pass http://127.0.0.1:4000;
@ -82,7 +82,6 @@ server {
slice 1m; slice 1m;
proxy_cache_key $host$uri$is_args$args$slice_range; proxy_cache_key $host$uri$is_args$args$slice_range;
proxy_set_header Range $slice_range; proxy_set_header Range $slice_range;
proxy_http_version 1.1;
proxy_cache_valid 200 206 301 304 1h; proxy_cache_valid 200 206 301 304 1h;
proxy_cache_lock on; proxy_cache_lock on;
proxy_ignore_client_abort on; proxy_ignore_client_abort on;
@ -92,14 +91,6 @@ server {
} }
location /api/fedsocket/v1 { location /api/fedsocket/v1 {
proxy_http_version 1.1;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header Host $host;
# The Important Websocket Bits!
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_request_buffering off; proxy_request_buffering off;
proxy_pass http://127.0.0.1:4000/api/fedsocket/v1; proxy_pass http://127.0.0.1:4000/api/fedsocket/v1;
} }