diff options
| author | Luke Hoersten <[email protected]> | 2022-11-06 22:03:27 -0600 |
|---|---|---|
| committer | Luke Hoersten <[email protected]> | 2022-11-06 22:03:27 -0600 |
| commit | 3cf3889b92cf553ade47f51d0130d69e67e7f992 (patch) | |
| tree | 28ac106384cb4ae0a1318ef3f836c4b8ef447a9d | |
| parent | ea7185e60c43db4e3625f07cd3628ecfded52b4a (diff) | |
Backed out changeset 10051617d075
| -rw-r--r-- | dendrite/server/templates/nginx.conf.j2 | 3 | ||||
| -rw-r--r-- | miniflux/templates/nginx.conf.j2 | 4 | ||||
| -rw-r--r-- | pleroma/otp/templates/pleroma.cloudflare.index.nginx.conf.j2 | 7 | ||||
| -rw-r--r-- | pleroma/otp/templates/pleroma.cloudflare.nginx.conf.j2 | 7 | ||||
| -rw-r--r-- | pleroma/otp/templates/pleroma.letsencrypt.nginx.conf.j2 | 7 | ||||
| -rw-r--r-- | writefreely/server/templates/nginx.conf.j2 | 10 |
6 files changed, 10 insertions, 28 deletions
diff --git a/dendrite/server/templates/nginx.conf.j2 b/dendrite/server/templates/nginx.conf.j2 index a69111d..8e2d34f 100644 --- a/dendrite/server/templates/nginx.conf.j2 +++ b/dendrite/server/templates/nginx.conf.j2 @@ -37,8 +37,7 @@ server { proxy_read_timeout 600; location /_matrix { - set $upstream http://127.0.0.1:{{nginx_proxy_port}}; - proxy_pass $upstream; + proxy_pass http://127.0.0.1:{{nginx_proxy_port}}; } root /var/www/{{nginx_server_name}}; diff --git a/miniflux/templates/nginx.conf.j2 b/miniflux/templates/nginx.conf.j2 index 9eca4be..b0e4c32 100644 --- a/miniflux/templates/nginx.conf.j2 +++ b/miniflux/templates/nginx.conf.j2 @@ -20,9 +20,7 @@ server { ssl_stapling_verify on; location / { - set $upstream {{nginx_proxy_pass}}; - proxy_pass $upstream; - + proxy_pass {{nginx_proxy_pass}}; 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 05010f2..7eccab5 100644 --- a/pleroma/otp/templates/pleroma.cloudflare.index.nginx.conf.j2 +++ b/pleroma/otp/templates/pleroma.cloudflare.index.nginx.conf.j2 @@ -61,8 +61,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header Host $http_host; - set $upstream {{pleroma_proxy_pass}}; - proxy_pass $upstream; + proxy_pass {{pleroma_proxy_pass}}; client_max_body_size 16m; } @@ -71,9 +70,7 @@ server { proxy_cache {{pleroma_instance}}-pleroma_media_cache; proxy_cache_lock on; proxy_ignore_client_abort on; - - set $upstream {{pleroma_proxy_pass}}; - proxy_pass $upstream; + proxy_pass {{pleroma_proxy_pass}}; } # 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 b55eff0..66058c8 100644 --- a/pleroma/otp/templates/pleroma.cloudflare.nginx.conf.j2 +++ b/pleroma/otp/templates/pleroma.cloudflare.nginx.conf.j2 @@ -53,8 +53,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header Host $http_host; - set $upstream {{pleroma_proxy_pass}}; - proxy_pass $upstream; + proxy_pass {{pleroma_proxy_pass}}; client_max_body_size 16m; } @@ -63,9 +62,7 @@ server { proxy_cache {{pleroma_instance}}-pleroma_media_cache; proxy_cache_lock on; proxy_ignore_client_abort on; - - set $upstream {{pleroma_proxy_pass}}; - proxy_pass $upstream; + proxy_pass {{pleroma_proxy_pass}}; } # 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 a300b84..126af36 100644 --- a/pleroma/otp/templates/pleroma.letsencrypt.nginx.conf.j2 +++ b/pleroma/otp/templates/pleroma.letsencrypt.nginx.conf.j2 @@ -58,8 +58,7 @@ server { proxy_set_header Connection "upgrade"; proxy_set_header Host $http_host; - set $upstream {{pleroma_proxy_pass}}; - proxy_pass $upstream; + proxy_pass {{pleroma_proxy_pass}}; client_max_body_size 16m; } @@ -68,9 +67,7 @@ server { proxy_cache {{pleroma_instance}}-pleroma_media_cache; proxy_cache_lock on; proxy_ignore_client_abort on; - - set $upstream {{pleroma_proxy_pass}}; - proxy_pass $upstream; + proxy_pass {{pleroma_proxy_pass}}; } # don't expose prometheus stats publicly diff --git a/writefreely/server/templates/nginx.conf.j2 b/writefreely/server/templates/nginx.conf.j2 index 9047f87..4f1cf4d 100644 --- a/writefreely/server/templates/nginx.conf.j2 +++ b/writefreely/server/templates/nginx.conf.j2 @@ -34,10 +34,7 @@ server { proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $remote_addr; - - set $upstream http://127.0.0.1:{{nginx_proxy_port}}; - proxy_pass $upstream; - + proxy_pass http://127.0.0.1:{{nginx_proxy_port}}; proxy_redirect off; } @@ -51,10 +48,7 @@ server { proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $remote_addr; - - set $upstream http://127.0.0.1:{{nginx_proxy_port}}; - proxy_pass $upstream; - + proxy_pass http://127.0.0.1:{{nginx_proxy_port}}; proxy_redirect off; } } |