# HG changeset patch # User Luke Hoersten # Date 1667780599 21600 # Node ID 10051617d0753556092a402764eb4b7d207a379b # Parent 9aa5f284ea103605e2dffca3dbabd61df5182b90 Fixed proxy pass. diff -r 9aa5f284ea10 -r 10051617d075 dendrite/server/templates/nginx.conf.j2 --- a/dendrite/server/templates/nginx.conf.j2 Sat Oct 22 14:51:55 2022 -0500 +++ b/dendrite/server/templates/nginx.conf.j2 Sun Nov 06 18:23:19 2022 -0600 @@ -37,7 +37,8 @@ proxy_read_timeout 600; location /_matrix { - proxy_pass http://127.0.0.1:{{nginx_proxy_port}}; + set $upstream http://127.0.0.1:{{nginx_proxy_port}}; + proxy_pass $upstream; } root /var/www/{{nginx_server_name}}; diff -r 9aa5f284ea10 -r 10051617d075 ergo/templates/nginx.conf.j2 --- a/ergo/templates/nginx.conf.j2 Sat Oct 22 14:51:55 2022 -0500 +++ b/ergo/templates/nginx.conf.j2 Sun Nov 06 18:23:19 2022 -0600 @@ -1,6 +1,9 @@ server { listen 6697 ssl; - proxy_pass unix:/var/ergo/socket; + + set $upstream unix:/var/ergo/socket; + proxy_pass $upstream; + proxy_protocol on; ssl_certificate {{nginx_ssl_cert}}; diff -r 9aa5f284ea10 -r 10051617d075 miniflux/templates/nginx.conf.j2 --- a/miniflux/templates/nginx.conf.j2 Sat Oct 22 14:51:55 2022 -0500 +++ b/miniflux/templates/nginx.conf.j2 Sun Nov 06 18:23:19 2022 -0600 @@ -20,7 +20,9 @@ ssl_stapling_verify on; location / { - proxy_pass {{nginx_proxy_pass}}; + set $upstream {{nginx_proxy_pass}}; + proxy_pass $upstream; + proxy_redirect off; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff -r 9aa5f284ea10 -r 10051617d075 pleroma/otp/templates/pleroma.cloudflare.index.nginx.conf.j2 --- a/pleroma/otp/templates/pleroma.cloudflare.index.nginx.conf.j2 Sat Oct 22 14:51:55 2022 -0500 +++ b/pleroma/otp/templates/pleroma.cloudflare.index.nginx.conf.j2 Sun Nov 06 18:23:19 2022 -0600 @@ -61,7 +61,8 @@ proxy_set_header Connection "upgrade"; proxy_set_header Host $http_host; - proxy_pass {{pleroma_proxy_pass}}; + set $upstream {{pleroma_proxy_pass}}; + proxy_pass $upstream; client_max_body_size 16m; } @@ -70,7 +71,9 @@ proxy_cache {{pleroma_instance}}-pleroma_media_cache; proxy_cache_lock on; proxy_ignore_client_abort on; - proxy_pass {{pleroma_proxy_pass}}; + + set $upstream {{pleroma_proxy_pass}}; + proxy_pass $upstream; } # don't expose prometheus stats publicly diff -r 9aa5f284ea10 -r 10051617d075 pleroma/otp/templates/pleroma.cloudflare.nginx.conf.j2 --- a/pleroma/otp/templates/pleroma.cloudflare.nginx.conf.j2 Sat Oct 22 14:51:55 2022 -0500 +++ b/pleroma/otp/templates/pleroma.cloudflare.nginx.conf.j2 Sun Nov 06 18:23:19 2022 -0600 @@ -53,7 +53,8 @@ proxy_set_header Connection "upgrade"; proxy_set_header Host $http_host; - proxy_pass {{pleroma_proxy_pass}}; + set $upstream {{pleroma_proxy_pass}}; + proxy_pass $upstream; client_max_body_size 16m; } @@ -62,7 +63,9 @@ proxy_cache {{pleroma_instance}}-pleroma_media_cache; proxy_cache_lock on; proxy_ignore_client_abort on; - proxy_pass {{pleroma_proxy_pass}}; + + set $upstream {{pleroma_proxy_pass}}; + proxy_pass $upstream; } # don't expose prometheus stats publicly diff -r 9aa5f284ea10 -r 10051617d075 pleroma/otp/templates/pleroma.letsencrypt.nginx.conf.j2 --- a/pleroma/otp/templates/pleroma.letsencrypt.nginx.conf.j2 Sat Oct 22 14:51:55 2022 -0500 +++ b/pleroma/otp/templates/pleroma.letsencrypt.nginx.conf.j2 Sun Nov 06 18:23:19 2022 -0600 @@ -58,7 +58,8 @@ proxy_set_header Connection "upgrade"; proxy_set_header Host $http_host; - proxy_pass {{pleroma_proxy_pass}}; + set $upstream {{pleroma_proxy_pass}}; + proxy_pass $upstream; client_max_body_size 16m; } @@ -67,7 +68,9 @@ proxy_cache {{pleroma_instance}}-pleroma_media_cache; proxy_cache_lock on; proxy_ignore_client_abort on; - proxy_pass {{pleroma_proxy_pass}}; + + set $upstream {{pleroma_proxy_pass}}; + proxy_pass $upstream; } # don't expose prometheus stats publicly diff -r 9aa5f284ea10 -r 10051617d075 writefreely/server/templates/nginx.conf.j2 --- a/writefreely/server/templates/nginx.conf.j2 Sat Oct 22 14:51:55 2022 -0500 +++ b/writefreely/server/templates/nginx.conf.j2 Sun Nov 06 18:23:19 2022 -0600 @@ -34,7 +34,10 @@ proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $remote_addr; - proxy_pass http://127.0.0.1:{{nginx_proxy_port}}; + + set $upstream http://127.0.0.1:{{nginx_proxy_port}}; + proxy_pass $upstream; + proxy_redirect off; } @@ -48,7 +51,10 @@ proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $remote_addr; - proxy_pass http://127.0.0.1:{{nginx_proxy_port}}; + + set $upstream http://127.0.0.1:{{nginx_proxy_port}}; + proxy_pass $upstream; + proxy_redirect off; } }