Add Port and Proto variables

Starker3 · Feb 18, 2020 · 0c24b78 · 0c24b78
1 parent a8c9468
commit 0c24b78
Show file tree

Hide file tree

Showing 136 changed files with 856 additions and 260 deletions.
diff --git a/adguard.subdomain.conf.sample b/adguard.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app adguard;
-        proxy_pass http://$upstream_app;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/adminer.subfolder.conf.sample b/adminer.subfolder.conf.sample
@@ -15,5 +15,8 @@ location ^~ /adminer/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app adminer;
-    proxy_pass http://$upstream_app:8080;
+    set $upstream_port 8080;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/airsonic.subdomain.conf.sample b/airsonic.subdomain.conf.sample
@@ -21,10 +21,13 @@ server {
         # enable the next two lines for ldap auth
         #auth_request /auth;
         #error_page 401 =200 /login;
-        
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app airsonic;
-        proxy_pass http://$upstream_app:4040;
+        set $upstream_port 4040;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/airsonic.subfolder.conf.sample b/airsonic.subfolder.conf.sample
@@ -12,5 +12,8 @@ location ^~ /airsonic {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app airsonic;
-    proxy_pass http://$upstream_app:4040;
+    set $upstream_port 4040;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/bazarr.subdomain.conf.sample b/bazarr.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app bazarr;
-        proxy_pass http://$upstream_app:6767;
+        set $upstream_port 6767;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/bazarr.subfolder.conf.sample b/bazarr.subfolder.conf.sample
@@ -15,5 +15,8 @@ location ^~ /bazarr/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app bazarr;
-    proxy_pass http://$upstream_app:6767;
+    set $upstream_port 6767;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/beets.subdomain.conf.sample b/beets.subdomain.conf.sample
@@ -1,4 +1,4 @@
-#First edit beets.yml and enable the reverse proxy settings, under "web" add "reverse_proxy: true" and restart the beets container. 
+#First edit beets.yml and enable the reverse proxy settings, under "web" add "reverse_proxy: true" and restart the beets container.
 #Make sure that your dns has a cname set for beets and that your beets container is not using a base url
 
 server {
@@ -26,6 +26,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app beets;
-        proxy_pass http://$upstream_app:8337;
+        set $upstream_port 8337;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/beets.subfolder.conf.sample b/beets.subfolder.conf.sample
@@ -12,7 +12,10 @@ location /beets {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app beets;
-    proxy_pass http://$upstream_app:8337;
+    set $upstream_port 8337;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     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
@@ -26,14 +26,20 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app bitwarden;
-        proxy_pass http://$upstream_app:80;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location /notifications/hub {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app bitwarden;
-        proxy_pass http://$upstream_app:80;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "Upgrade";
     }
@@ -42,7 +48,10 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app bitwarden;
-        proxy_pass http://$upstream_app:80;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
 }
diff --git a/booksonic.subdomain.conf.sample b/booksonic.subdomain.conf.sample
@@ -21,10 +21,13 @@ server {
         # enable the next two lines for ldap auth
         #auth_request /auth;
         #error_page 401 =200 /login;
-        
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app booksonic;
-        proxy_pass http://$upstream_app:4040;
+        set $upstream_port 4040;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/booksonic.subfolder.conf.sample b/booksonic.subfolder.conf.sample
@@ -12,5 +12,8 @@ location ^~ /booksonic {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app booksonic;
-    proxy_pass http://$upstream_app:4040;
+    set $upstream_port 4040;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/calibre-web.subdomain.conf.sample b/calibre-web.subdomain.conf.sample
@@ -25,7 +25,10 @@ server {
     include /config/nginx/proxy.conf;
 		resolver 127.0.0.11 valid=30s;
 		set $upstream_app calibre-web;
-		proxy_pass http://$upstream_app:8083;
+		set $upstream_port 8083;
+		set $upstream_proto http;
+		proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 		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
@@ -14,7 +14,10 @@ location ^~ /calibre-web/ {
 
     resolver 127.0.0.11 valid=30s;
     set $upstream_app calibre-web;
-    proxy_pass http://$upstream_app:8083;
+    set $upstream_port 8083;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     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
@@ -24,7 +24,10 @@ server {
 
         resolver 127.0.0.11 valid=30s;
         set $upstream_app calibre;
-        proxy_pass http://$upstream_app:8080;
+        set $upstream_port 8080;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         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
@@ -1,4 +1,4 @@
-# calibre does not require a base url setting 
+# calibre does not require a base url setting
 
 location /calibre {
     return 301 $scheme://$host/calibre/;
@@ -14,6 +14,9 @@ location ^~ /calibre/ {
 
     resolver 127.0.0.11 valid=30s;
     set $upstream_app calibre;
+    set $upstream_port 8080;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /calibre(.*) $1 break;
-    proxy_pass http://$upstream_app:8080;
 }
diff --git a/code-server.subdomain.conf.sample b/code-server.subdomain.conf.sample
@@ -25,7 +25,10 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app code-server;
-        proxy_pass http://$upstream_app:8443;
+        set $upstream_port 8443;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection upgrade;
     }

diff --git a/codimd.subdomain.conf.sample b/codimd.subdomain.conf.sample
@@ -27,6 +27,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app codimd;
-        proxy_pass http://$upstream_app:3000;
+        set $upstream_port 3000;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
-}
+}
diff --git a/collabora.subdomain.conf.sample b/collabora.subdomain.conf.sample
@@ -12,31 +12,43 @@ server {
     location ^~ /loleaflet {
         resolver 127.0.0.11 valid=30s;
         set $upstream_app collabora;
-        proxy_pass https://$upstream_app:9980;
+        set $upstream_port 9980;
+        set $upstream_proto https;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_set_header Host $http_host;
     }
 
     # WOPI discovery URL
     location ^~ /hosting/discovery {
         resolver 127.0.0.11 valid=30s;
         set $upstream_app collabora;
-        proxy_pass https://$upstream_app:9980;
+        set $upstream_port 9980;
+        set $upstream_proto https;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_set_header Host $http_host;
     }
 
     # Capabilities
     location ^~ /hosting/capabilities {
         resolver 127.0.0.11 valid=30s;
         set $upstream_app collabora;
-        proxy_pass https://$upstream_app:9980;
+        set $upstream_port 9980;
+        set $upstream_proto https;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_set_header Host $http_host;
     }
 
     # main websocket
     location ~ ^/lool/(.*)/ws$ {
         resolver 127.0.0.11 valid=30s;
         set $upstream_app collabora;
-        proxy_pass https://$upstream_app:9980;
+        set $upstream_port 9980;
+        set $upstream_proto https;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "Upgrade";
         proxy_set_header Host $http_host;
@@ -47,15 +59,21 @@ server {
     location ~ ^/lool {
         resolver 127.0.0.11 valid=30s;
         set $upstream_app collabora;
-        proxy_pass https://$upstream_app:9980;
+        set $upstream_port 9980;
+        set $upstream_proto https;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_set_header Host $http_host;
     }
 
     # Admin Console websocket
     location ^~ /lool/adminws {
         resolver 127.0.0.11 valid=30s;
         set $upstream_app collabora;
-        proxy_pass https://$upstream_app:9980;
+        set $upstream_port 9980;
+        set $upstream_proto https;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         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
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app couchpotato;
-        proxy_pass http://$upstream_app:5050;
+        set $upstream_port 5050;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/couchpotato.subfolder.conf.sample b/couchpotato.subfolder.conf.sample
@@ -12,5 +12,8 @@ location ^~ /couchpotato {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app couchpotato;
-    proxy_pass http://$upstream_app:5050;
+    set $upstream_port 5050;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/deluge.subdomain.conf.sample b/deluge.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app deluge;
-        proxy_pass http://$upstream_app:8112;
+        set $upstream_port 8112;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/deluge.subfolder.conf.sample b/deluge.subfolder.conf.sample
@@ -15,7 +15,10 @@ location ^~ /deluge/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app deluge;
+    set $upstream_port 8112;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /deluge(.*) $1 break;
-    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
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app dillinger;
-        proxy_pass http://$upstream_app:8080;
+        set $upstream_port 8080;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
-}
+}
diff --git a/dokuwiki.subdomain.conf.sample b/dokuwiki.subdomain.conf.sample
@@ -1,4 +1,4 @@
-# First complete the setup by appending install.php to URL. 
+# First complete the setup by appending install.php to URL.
 # Make sure that your dns has a cname set for dokuwiki
 
 server {
@@ -26,6 +26,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app dokuwiki;
-        proxy_pass http://$upstream_app:80;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/domoticz.subdomain.conf.sample b/domoticz.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app domoticz;
-        proxy_pass http://$upstream_app:8080;
+        set $upstream_port 8080;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
-}
+}