From 464cbc372635cd82c98749931ac6901b1f81e968 Mon Sep 17 00:00:00 2001 From: Luke Hoersten Date: Sun, 6 Nov 2022 18:23:19 -0600 Subject: Fixed proxy pass. --- dendrite/server/templates/nginx.conf.j2 | 3 ++- ergo/templates/nginx.conf.j2 | 5 ++++- miniflux/templates/nginx.conf.j2 | 4 +++- pleroma/otp/templates/pleroma.cloudflare.index.nginx.conf.j2 | 7 +++++-- pleroma/otp/templates/pleroma.cloudflare.nginx.conf.j2 | 7 +++++-- pleroma/otp/templates/pleroma.letsencrypt.nginx.conf.j2 | 7 +++++-- writefreely/server/templates/nginx.conf.j2 | 10 ++++++++-- 7 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dendrite/server/templates/nginx.conf.j2 b/dendrite/server/templates/nginx.conf.j2 index 8e2d34f..a69111d 100644 --- a/dendrite/server/templates/nginx.conf.j2 +++ b/dendrite/server/templates/nginx.conf.j2 @@ -37,7 +37,8 @@ server { 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 --git a/ergo/templates/nginx.conf.j2 b/ergo/templates/nginx.conf.j2 index 1b1a83b..324376b 100644 --- a/ergo/templates/nginx.conf.j2 +++ b/ergo/templates/nginx.conf.j2 @@ -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 --git a/miniflux/templates/nginx.conf.j2 b/miniflux/templates/nginx.conf.j2 index b0e4c32..9eca4be 100644 --- a/miniflux/templates/nginx.conf.j2 +++ b/miniflux/templates/nginx.conf.j2 @@ -20,7 +20,9 @@ server { 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 --git a/pleroma/otp/templates/pleroma.cloudflare.index.nginx.conf.j2 b/pleroma/otp/templates/pleroma.cloudflare.index.nginx.conf.j2 index 7eccab5..05010f2 100644 --- a/pleroma/otp/templates/pleroma.cloudflare.index.nginx.conf.j2 +++ b/pleroma/otp/templates/pleroma.cloudflare.index.nginx.conf.j2 @@ -61,7 +61,8 @@ server { 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 @@ server { 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 --git a/pleroma/otp/templates/pleroma.cloudflare.nginx.conf.j2 b/pleroma/otp/templates/pleroma.cloudflare.nginx.conf.j2 index 66058c8..b55eff0 100644 --- a/pleroma/otp/templates/pleroma.cloudflare.nginx.conf.j2 +++ b/pleroma/otp/templates/pleroma.cloudflare.nginx.conf.j2 @@ -53,7 +53,8 @@ server { 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 @@ server { 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 --git a/pleroma/otp/templates/pleroma.letsencrypt.nginx.conf.j2 b/pleroma/otp/templates/pleroma.letsencrypt.nginx.conf.j2 index 126af36..a300b84 100644 --- a/pleroma/otp/templates/pleroma.letsencrypt.nginx.conf.j2 +++ b/pleroma/otp/templates/pleroma.letsencrypt.nginx.conf.j2 @@ -58,7 +58,8 @@ server { 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 @@ server { 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 --git a/writefreely/server/templates/nginx.conf.j2 b/writefreely/server/templates/nginx.conf.j2 index 4f1cf4d..9047f87 100644 --- a/writefreely/server/templates/nginx.conf.j2 +++ b/writefreely/server/templates/nginx.conf.j2 @@ -34,7 +34,10 @@ server { 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 @@ server { 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; } } -- cgit v1.2.3