standardize upstream_app variable

Starker3 · Feb 16, 2020 · 06a1941 · 06a1941
1 parent c2ae00c
commit 06a1941
Show file tree

Hide file tree

Showing 136 changed files with 430 additions and 430 deletions.
diff --git a/adguard.subdomain.conf.sample b/adguard.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_adguard adguard;
-        proxy_pass http://$upstream_adguard;
+        set $upstream_app adguard;
+        proxy_pass http://$upstream_app;
     }
 }
diff --git a/adminer.subfolder.conf.sample b/adminer.subfolder.conf.sample
@@ -14,6 +14,6 @@ location ^~ /adminer/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_adminer adminer;
-    proxy_pass http://$upstream_adminer:8080;
+    set $upstream_app adminer;
+    proxy_pass http://$upstream_app:8080;
 }
diff --git a/airsonic.subdomain.conf.sample b/airsonic.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_airsonic airsonic;
-        proxy_pass http://$upstream_airsonic:4040;
+        set $upstream_app airsonic;
+        proxy_pass http://$upstream_app:4040;
     }
 }
diff --git a/airsonic.subfolder.conf.sample b/airsonic.subfolder.conf.sample
@@ -11,6 +11,6 @@ location ^~ /airsonic {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_airsonic airsonic;
-    proxy_pass http://$upstream_airsonic:4040;
+    set $upstream_app airsonic;
+    proxy_pass http://$upstream_app:4040;
 }
diff --git a/bazarr.subdomain.conf.sample b/bazarr.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_bazarr bazarr;
-        proxy_pass http://$upstream_bazarr:6767;
+        set $upstream_app bazarr;
+        proxy_pass http://$upstream_app:6767;
     }
 }
diff --git a/bazarr.subfolder.conf.sample b/bazarr.subfolder.conf.sample
@@ -14,6 +14,6 @@ location ^~ /bazarr/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_bazarr bazarr;
-    proxy_pass http://$upstream_bazarr:6767;
+    set $upstream_app bazarr;
+    proxy_pass http://$upstream_app:6767;
 }
diff --git a/beets.subdomain.conf.sample b/beets.subdomain.conf.sample
@@ -25,7 +25,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_beets beets;
-        proxy_pass http://$upstream_beets:8337;
+        set $upstream_app beets;
+        proxy_pass http://$upstream_app:8337;
     }
 }
diff --git a/beets.subfolder.conf.sample b/beets.subfolder.conf.sample
@@ -11,8 +11,8 @@ location /beets {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_beets beets;
-    proxy_pass http://$upstream_beets:8337;
+    set $upstream_app beets;
+    proxy_pass http://$upstream_app:8337;
     proxy_set_header Host $host;
     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header X-Scheme $scheme;

diff --git a/bitwarden.subdomain.conf.sample b/bitwarden.subdomain.conf.sample
@@ -25,24 +25,24 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_bitwarden bitwarden;
-        proxy_pass http://$upstream_bitwarden:80;
+        set $upstream_app bitwarden;
+        proxy_pass http://$upstream_app:80;
     }
 
     location /notifications/hub {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_bitwarden bitwarden;
-        proxy_pass http://$upstream_bitwarden:80;
+        set $upstream_app bitwarden;
+        proxy_pass http://$upstream_app:80;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "Upgrade";
     }
 
     location /notifications/hub/negotiate {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_bitwarden bitwarden;
-        proxy_pass http://$upstream_bitwarden:80;
+        set $upstream_app bitwarden;
+        proxy_pass http://$upstream_app:80;
     }
 
 }
diff --git a/booksonic.subdomain.conf.sample b/booksonic.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_booksonic booksonic;
-        proxy_pass http://$upstream_boksonic:4040;
+        set $upstream_app booksonic;
+        proxy_pass http://$upstream_app:4040;
     }
 }
diff --git a/booksonic.subfolder.conf.sample b/booksonic.subfolder.conf.sample
@@ -11,6 +11,6 @@ location ^~ /booksonic {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_booksonic booksonic;
-    proxy_pass http://$upstream_booksonic:4040;
+    set $upstream_app booksonic;
+    proxy_pass http://$upstream_app:4040;
 }
diff --git a/calibre-web.subdomain.conf.sample b/calibre-web.subdomain.conf.sample
@@ -24,8 +24,8 @@ server {
 
     include /config/nginx/proxy.conf;
 		resolver 127.0.0.11 valid=30s;
-		set $upstream_calibre_web calibre-web;
-		proxy_pass http://$upstream_calibre_web:8083;
+		set $upstream_app calibre-web;
+		proxy_pass http://$upstream_app:8083;
 		proxy_set_header Host $http_host;
 		proxy_set_header X-Scheme $scheme;
 	}

diff --git a/calibre-web.subfolder.conf.sample b/calibre-web.subfolder.conf.sample
@@ -13,8 +13,8 @@ location ^~ /calibre-web/ {
     #error_page 401 =200 /login;
 
     resolver 127.0.0.11 valid=30s;
-    set $upstream_calibre_web calibre-web;
-    proxy_pass http://$upstream_calibre_web:8083;
+    set $upstream_app calibre-web;
+    proxy_pass http://$upstream_app:8083;
     proxy_set_header Host $http_host;
     proxy_set_header X-Scheme $scheme;
     proxy_set_header X-Script-Name /calibre-web;

diff --git a/calibre.subdomain.conf.sample b/calibre.subdomain.conf.sample
@@ -23,8 +23,8 @@ server {
         #error_page 401 =200 /login;
 
         resolver 127.0.0.11 valid=30s;
-        set $upstream_calibre calibre;
-        proxy_pass http://$upstream_calibre:8080;
+        set $upstream_app calibre;
+        proxy_pass http://$upstream_app:8080;
         proxy_buffering off;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection $http_connection;

diff --git a/calibre.subfolder.conf.sample b/calibre.subfolder.conf.sample
@@ -13,7 +13,7 @@ location ^~ /calibre/ {
     #error_page 401 =200 /login;
 
     resolver 127.0.0.11 valid=30s;
-    set $upstream_calibre calibre;
+    set $upstream_app calibre;
     rewrite /calibre(.*) $1 break;
-    proxy_pass http://$upstream_calibre:8080;
+    proxy_pass http://$upstream_app:8080;
 }
diff --git a/code-server.subdomain.conf.sample b/code-server.subdomain.conf.sample
@@ -24,8 +24,8 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_code_server code-server;
-        proxy_pass http://$upstream_code_server:8443;
+        set $upstream_app code-server;
+        proxy_pass http://$upstream_app:8443;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection upgrade;
     }

diff --git a/codimd.subdomain.conf.sample b/codimd.subdomain.conf.sample
@@ -26,7 +26,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_codimd codimd;
-        proxy_pass http://$upstream_codimd:3000;
+        set $upstream_app codimd;
+        proxy_pass http://$upstream_app:3000;
     }
 }
diff --git a/collabora.subdomain.conf.sample b/collabora.subdomain.conf.sample
@@ -11,32 +11,32 @@ server {
     # static files
     location ^~ /loleaflet {
         resolver 127.0.0.11 valid=30s;
-        set $upstream_collabora collabora;
-        proxy_pass https://$upstream_collabora:9980;
+        set $upstream_app collabora;
+        proxy_pass https://$upstream_app:9980;
         proxy_set_header Host $http_host;
     }
 
     # WOPI discovery URL
     location ^~ /hosting/discovery {
         resolver 127.0.0.11 valid=30s;
-        set $upstream_collabora collabora;
-        proxy_pass https://$upstream_collabora:9980;
+        set $upstream_app collabora;
+        proxy_pass https://$upstream_app:9980;
         proxy_set_header Host $http_host;
     }
 
     # Capabilities
     location ^~ /hosting/capabilities {
         resolver 127.0.0.11 valid=30s;
-        set $upstream_collabora collabora;
-        proxy_pass https://$upstream_collabora:9980;
+        set $upstream_app collabora;
+        proxy_pass https://$upstream_app:9980;
         proxy_set_header Host $http_host;
     }
 
     # main websocket
     location ~ ^/lool/(.*)/ws$ {
         resolver 127.0.0.11 valid=30s;
-        set $upstream_collabora collabora;
-        proxy_pass https://$upstream_collabora:9980;
+        set $upstream_app collabora;
+        proxy_pass https://$upstream_app:9980;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "Upgrade";
         proxy_set_header Host $http_host;
@@ -46,16 +46,16 @@ server {
     # download, presentation and image upload
     location ~ ^/lool {
         resolver 127.0.0.11 valid=30s;
-        set $upstream_collabora collabora;
-        proxy_pass https://$upstream_collabora:9980;
+        set $upstream_app collabora;
+        proxy_pass https://$upstream_app:9980;
         proxy_set_header Host $http_host;
     }
 
     # Admin Console websocket
     location ^~ /lool/adminws {
         resolver 127.0.0.11 valid=30s;
-        set $upstream_collabora collabora;
-        proxy_pass https://$upstream_collabora:9980;
+        set $upstream_app collabora;
+        proxy_pass https://$upstream_app:9980;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "Upgrade";
         proxy_set_header Host $http_host;

diff --git a/couchpotato.subdomain.conf.sample b/couchpotato.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_couchpotato couchpotato;
-        proxy_pass http://$upstream_couchpotato:5050;
+        set $upstream_app couchpotato;
+        proxy_pass http://$upstream_app:5050;
     }
 }
diff --git a/couchpotato.subfolder.conf.sample b/couchpotato.subfolder.conf.sample
@@ -11,6 +11,6 @@ location ^~ /couchpotato {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_couchpotato couchpotato;
-    proxy_pass http://$upstream_couchpotato:5050;
+    set $upstream_app couchpotato;
+    proxy_pass http://$upstream_app:5050;
 }
diff --git a/deluge.subdomain.conf.sample b/deluge.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_deluge deluge;
-        proxy_pass http://$upstream_deluge:8112;
+        set $upstream_app deluge;
+        proxy_pass http://$upstream_app:8112;
     }
 }
diff --git a/deluge.subfolder.conf.sample b/deluge.subfolder.conf.sample
@@ -14,8 +14,8 @@ location ^~ /deluge/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_deluge deluge;
+    set $upstream_app deluge;
     rewrite /deluge(.*) $1 break;
-    proxy_pass http://$upstream_deluge:8112;
+    proxy_pass http://$upstream_app:8112;
     proxy_set_header X-Deluge-Base "/deluge/";
 }
diff --git a/dillinger.subdomain.conf.sample b/dillinger.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_dillinger dillinger;
-        proxy_pass http://$upstream_dillinger:8080;
+        set $upstream_app dillinger;
+        proxy_pass http://$upstream_app:8080;
     }
 }
diff --git a/dokuwiki.subdomain.conf.sample b/dokuwiki.subdomain.conf.sample
@@ -25,7 +25,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_dokuwiki dokuwiki;
-        proxy_pass http://$upstream_dokuwiki:80;
+        set $upstream_app dokuwiki;
+        proxy_pass http://$upstream_app:80;
     }
 }
diff --git a/domoticz.subdomain.conf.sample b/domoticz.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_domoticz domoticz;
-        proxy_pass http://$upstream_domoticz:8080;
+        set $upstream_app domoticz;
+        proxy_pass http://$upstream_app:8080;
     }
 }
diff --git a/domoticz.subfolder.conf.sample b/domoticz.subfolder.conf.sample
@@ -11,6 +11,6 @@ location ^~ /domoticz/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_domoticz domoticz;
-    proxy_pass http://$upstream_domoticz:8080;
+    set $upstream_app domoticz;
+    proxy_pass http://$upstream_app:8080;
 }
diff --git a/dozzle.subfolder.conf.sample b/dozzle.subfolder.conf.sample
@@ -17,6 +17,6 @@ location ^~ /dozzle/ {
     proxy_buffering off;
     proxy_cache off;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_dozzle dozzle;
-    proxy_pass http://$upstream_dozzle:8080;
+    set $upstream_app dozzle;
+    proxy_pass http://$upstream_app:8080;
 }
diff --git a/duplicati.subdomain.conf.sample b/duplicati.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
         #error_page 401 =200 /login;
 
         resolver 127.0.0.11 valid=30s;
-        set $upstream_duplicati duplicati;
-        proxy_pass http://$upstream_duplicati:8200;
+        set $upstream_app duplicati;
+        proxy_pass http://$upstream_app:8200;
     }
 }
diff --git a/duplicati.subfolder.conf.sample b/duplicati.subfolder.conf.sample
@@ -13,7 +13,7 @@ location ^~ /duplicati/ {
     #error_page 401 =200 /login;
 
     resolver 127.0.0.11 valid=30s;
-    set $upstream_duplicati duplicati;
+    set $upstream_app duplicati;
     rewrite /duplicati(.*) $1 break;
-    proxy_pass http://$upstream_duplicati:8200;
+    proxy_pass http://$upstream_app:8200;
 }
diff --git a/emby.subdomain.conf.sample b/emby.subdomain.conf.sample
@@ -1,6 +1,6 @@
 # make sure that your dns has a cname set for emby, if emby is running in bridge mode, the below config should work as is, although,
-# the container name is expected to be "emby", if not, replace the lines "set $upstream_emby emby;" with "set $upstream_emby <containername>;"
-# for host mode, replace the lines "proxy_pass http://$upstream_emby:8096;" with "proxy_pass http://HOSTIP:8096;" HOSTIP being the IP address of emby
+# the container name is expected to be "emby", if not, replace the lines "set $upstream_app emby;" with "set $upstream_app <containername>;"
+# for host mode, replace the lines "proxy_pass http://$upstream_app:8096;" with "proxy_pass http://HOSTIP:8096;" HOSTIP being the IP address of emby
 # in emby settings, under "Advanced" change the public https port to 443, leave the local ports as is, set the "external domain" to your url,
 # and set the "Secure connection mode" to "Handled by reverse proxy"
 
@@ -17,8 +17,8 @@ server {
     location / {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_emby emby;
-        proxy_pass http://$upstream_emby:8096;
+        set $upstream_app emby;
+        proxy_pass http://$upstream_app:8096;
 
         proxy_set_header Range $http_range;
         proxy_set_header If-Range $http_if_range;
@@ -27,8 +27,8 @@ server {
     location ~ (/emby)?/socket {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_emby emby;
-        proxy_pass http://$upstream_emby:8096;
+        set $upstream_app emby;
+        proxy_pass http://$upstream_app:8096;
 
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection $http_connection;