# HG changeset patch
# User Luke Hoersten <luke@hoersten.org>
# Date 1667793807 21600
# Node ID 252069788104e0d82dc53ce80d8951fe3f33be85
# Parent  e209c4dc5280f45f2bf1f2a656efe220e5c320bb
Backed out changeset 10051617d075

diff -r e209c4dc5280 -r 252069788104 dendrite/server/templates/nginx.conf.j2
--- a/dendrite/server/templates/nginx.conf.j2	Sun Nov 06 21:39:24 2022 -0600
+++ b/dendrite/server/templates/nginx.conf.j2	Sun Nov 06 22:03:27 2022 -0600
@@ -37,8 +37,7 @@
     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 -r e209c4dc5280 -r 252069788104 miniflux/templates/nginx.conf.j2
--- a/miniflux/templates/nginx.conf.j2	Sun Nov 06 21:39:24 2022 -0600
+++ b/miniflux/templates/nginx.conf.j2	Sun Nov 06 22:03:27 2022 -0600
@@ -20,9 +20,7 @@
     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 -r e209c4dc5280 -r 252069788104 pleroma/otp/templates/pleroma.cloudflare.index.nginx.conf.j2
--- a/pleroma/otp/templates/pleroma.cloudflare.index.nginx.conf.j2	Sun Nov 06 21:39:24 2022 -0600
+++ b/pleroma/otp/templates/pleroma.cloudflare.index.nginx.conf.j2	Sun Nov 06 22:03:27 2022 -0600
@@ -61,8 +61,7 @@
         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 @@
         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 -r e209c4dc5280 -r 252069788104 pleroma/otp/templates/pleroma.cloudflare.nginx.conf.j2
--- a/pleroma/otp/templates/pleroma.cloudflare.nginx.conf.j2	Sun Nov 06 21:39:24 2022 -0600
+++ b/pleroma/otp/templates/pleroma.cloudflare.nginx.conf.j2	Sun Nov 06 22:03:27 2022 -0600
@@ -53,8 +53,7 @@
         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 @@
         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 -r e209c4dc5280 -r 252069788104 pleroma/otp/templates/pleroma.letsencrypt.nginx.conf.j2
--- a/pleroma/otp/templates/pleroma.letsencrypt.nginx.conf.j2	Sun Nov 06 21:39:24 2022 -0600
+++ b/pleroma/otp/templates/pleroma.letsencrypt.nginx.conf.j2	Sun Nov 06 22:03:27 2022 -0600
@@ -58,8 +58,7 @@
         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 @@
         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 -r e209c4dc5280 -r 252069788104 writefreely/server/templates/nginx.conf.j2
--- a/writefreely/server/templates/nginx.conf.j2	Sun Nov 06 21:39:24 2022 -0600
+++ b/writefreely/server/templates/nginx.conf.j2	Sun Nov 06 22:03:27 2022 -0600
@@ -34,10 +34,7 @@
         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 @@
         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;
     }
 }