From c2caf4437d6f2b80270bb42d826108f25e9c570a Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Mon, 17 Jun 2019 16:56:36 -0400
Subject: [PATCH 001/126] Create calibre.subdomain.conf.sample

---
 calibre.subdomain.conf.sample | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 calibre.subdomain.conf.sample

diff --git a/calibre.subdomain.conf.sample b/calibre.subdomain.conf.sample
new file mode 100644
index 0000000..af6a749
--- /dev/null
+++ b/calibre.subdomain.conf.sample
@@ -0,0 +1,32 @@
+# make sure that your dns has a cname set for calibre
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name calibre.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # enable the next two lines for ldap auth
+        #auth_request /auth;
+        #error_page 401 =200 /login;
+
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_calibre calibre;
+        proxy_pass http://$upstream_calibre:8080;
+        proxy_buffering off;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $http_connection;
+    }
+}

From 3c1688df85254cbea8f89e6ceab70e3ee2a5983e Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Wed, 19 Jun 2019 17:25:51 -0400
Subject: [PATCH 002/126] Create calibre.subfolder.conf.sample

---
 calibre.subfolder.conf.sample | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 calibre.subfolder.conf.sample

diff --git a/calibre.subfolder.conf.sample b/calibre.subfolder.conf.sample
new file mode 100644
index 0000000..afc6a96
--- /dev/null
+++ b/calibre.subfolder.conf.sample
@@ -0,0 +1,19 @@
+# calibre does not require a base url setting 
+
+location /calibre {
+    return 301 $scheme://$host/calibre/;
+}
+location ^~ /calibre/ {
+    # enable the next two lines for http auth
+    #auth_basic "Restricted";
+    #auth_basic_user_file /config/nginx/.htpasswd;
+
+    # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
+    #auth_request /auth;
+    #error_page 401 =200 /login;
+
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_calibre calibre;
+    rewrite /calibre(.*) $1 break;
+    proxy_pass http://$upstream_calibre:8080;
+}

From 2c73d5695dce3758afb636bd1bec55671be38dca Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Fri, 21 Jun 2019 13:07:49 -0400
Subject: [PATCH 003/126] Update jellyfin.subfolder.conf.sample

---
 jellyfin.subfolder.conf.sample | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/jellyfin.subfolder.conf.sample b/jellyfin.subfolder.conf.sample
index 7e64d04..e0141c3 100644
--- a/jellyfin.subfolder.conf.sample
+++ b/jellyfin.subfolder.conf.sample
@@ -11,18 +11,11 @@ location ^~ /jellyfin/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_jellyfin jellyfin;
+    rewrite /jellyfin(.*) $1 break;
     proxy_pass http://$upstream_jellyfin:8096;
     
     proxy_set_header Range $http_range;
     proxy_set_header If-Range $http_if_range;
-}
-
-location ^~ /jellyfinwebsocket {
-    include /config/nginx/proxy.conf;
-    resolver 127.0.0.11 valid=30s;
-    set $upstream_jellyfin jellyfin;
-    proxy_pass http://$upstream_jellyfin:8096;
-
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $http_connection;
 }

From 8868fa398b4686add1542d3d6f21875622e7b429 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Fri, 21 Jun 2019 13:18:55 -0400
Subject: [PATCH 004/126] Update jellyfin.subdomain.conf.sample

---
 jellyfin.subdomain.conf.sample | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jellyfin.subdomain.conf.sample b/jellyfin.subdomain.conf.sample
index 9f58b5d..2cd6a06 100644
--- a/jellyfin.subdomain.conf.sample
+++ b/jellyfin.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
         proxy_set_header If-Range $http_if_range;
     }
 	
-    location ~ (/jellyfin)?/socket {
+    location ~ (/jellyfin)?/embywebsocket {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_jellyfin jellyfin;
@@ -33,4 +33,4 @@ server {
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection $http_connection;
    }
-}
\ No newline at end of file
+}

From cff3a3ff1e8f5c0e805e802c45ad49b772b4f38f Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Mon, 17 Jun 2019 14:38:12 -0400
Subject: [PATCH 005/126] Create calibre-web.subfolder.conf.sample

---
 calibre-web.subfolder.conf.sample | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 calibre-web.subfolder.conf.sample

diff --git a/calibre-web.subfolder.conf.sample b/calibre-web.subfolder.conf.sample
new file mode 100644
index 0000000..6bd0fbc
--- /dev/null
+++ b/calibre-web.subfolder.conf.sample
@@ -0,0 +1,21 @@
+# calibre-web does not require a base url setting
+
+location /calibre-web {
+    return 301 $scheme://$host/calibre-web/;
+}
+location ^~ /calibre-web/ {
+    # enable the next two lines for http auth
+    #auth_basic "Restricted";
+    #auth_basic_user_file /config/nginx/.htpasswd;
+
+    # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
+    #auth_request /auth;
+    #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;
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Scheme $scheme;
+    proxy_set_header X-Script-Name /calibre-web;
+}

From b9fe68949a2d696f6874d4e733b13cbc28675b7a Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Tue, 25 Jun 2019 11:41:38 -0400
Subject: [PATCH 006/126] Create code-server.subdomain.conf.sample

---
 code-server.subdomain.conf.sample | 32 +++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 code-server.subdomain.conf.sample

diff --git a/code-server.subdomain.conf.sample b/code-server.subdomain.conf.sample
new file mode 100644
index 0000000..65f7d86
--- /dev/null
+++ b/code-server.subdomain.conf.sample
@@ -0,0 +1,32 @@
+# make sure that your dns has a cname set for code-server
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name code-server.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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_code_server code-server;
+        proxy_pass http://$upstream_code_server:8443;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection upgrade;
+    }
+}

From 8756b187d6e17ebec9e5ed3909f7ba3a4586b8fe Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Mon, 22 Jul 2019 08:49:53 -0500
Subject: [PATCH 007/126] Add non-auth locations for qbittorrent

---
 qbittorrent.subdomain.conf.sample | 55 +++++++++++++++++++++++++++++++
 qbittorrent.subfolder.conf.sample | 55 +++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+)

diff --git a/qbittorrent.subdomain.conf.sample b/qbittorrent.subdomain.conf.sample
index cdacdc7..f003f37 100644
--- a/qbittorrent.subdomain.conf.sample
+++ b/qbittorrent.subdomain.conf.sample
@@ -30,4 +30,59 @@ server {
         proxy_set_header Referer '';
         proxy_set_header Host $upstream_qbittorrent:8080;
     }
+
+    location ^~ /qbittorrent/api {
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_qbittorrent qbittorrent;
+        rewrite /qbittorrent(.*) $1 break;
+        proxy_pass http://$upstream_qbittorrent:8080;
+
+        proxy_set_header Referer '';
+        proxy_set_header Host $upstream_qbittorrent:8080;
+    }
+
+    location ^~ /qbittorrent/command {
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_qbittorrent qbittorrent;
+        rewrite /qbittorrent(.*) $1 break;
+        proxy_pass http://$upstream_qbittorrent:8080;
+
+        proxy_set_header Referer '';
+        proxy_set_header Host $upstream_qbittorrent:8080;
+    }
+
+    location ^~ /qbittorrent/query {
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_qbittorrent qbittorrent;
+        rewrite /qbittorrent(.*) $1 break;
+        proxy_pass http://$upstream_qbittorrent:8080;
+
+        proxy_set_header Referer '';
+        proxy_set_header Host $upstream_qbittorrent:8080;
+    }
+
+    location ^~ /qbittorrent/login {
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_qbittorrent qbittorrent;
+        rewrite /qbittorrent(.*) $1 break;
+        proxy_pass http://$upstream_qbittorrent:8080;
+
+        proxy_set_header Referer '';
+        proxy_set_header Host $upstream_qbittorrent:8080;
+    }
+
+    location ^~ /qbittorrent/sync {
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_qbittorrent qbittorrent;
+        rewrite /qbittorrent(.*) $1 break;
+        proxy_pass http://$upstream_qbittorrent:8080;
+
+        proxy_set_header Referer '';
+        proxy_set_header Host $upstream_qbittorrent:8080;
+    }
 }
diff --git a/qbittorrent.subfolder.conf.sample b/qbittorrent.subfolder.conf.sample
index 105b97b..3799d6b 100644
--- a/qbittorrent.subfolder.conf.sample
+++ b/qbittorrent.subfolder.conf.sample
@@ -21,3 +21,58 @@ location ^~ /qbittorrent/ {
     proxy_set_header Referer '';
     proxy_set_header Host $upstream_qbittorrent:8080;
 }
+
+location ^~ /qbittorrent/api {
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_qbittorrent qbittorrent;
+    rewrite /qbittorrent(.*) $1 break;
+    proxy_pass http://$upstream_qbittorrent:8080;
+
+    proxy_set_header Referer '';
+    proxy_set_header Host $upstream_qbittorrent:8080;
+}
+
+location ^~ /qbittorrent/command {
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_qbittorrent qbittorrent;
+    rewrite /qbittorrent(.*) $1 break;
+    proxy_pass http://$upstream_qbittorrent:8080;
+
+    proxy_set_header Referer '';
+    proxy_set_header Host $upstream_qbittorrent:8080;
+}
+
+location ^~ /qbittorrent/query {
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_qbittorrent qbittorrent;
+    rewrite /qbittorrent(.*) $1 break;
+    proxy_pass http://$upstream_qbittorrent:8080;
+
+    proxy_set_header Referer '';
+    proxy_set_header Host $upstream_qbittorrent:8080;
+}
+
+location ^~ /qbittorrent/login {
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_qbittorrent qbittorrent;
+    rewrite /qbittorrent(.*) $1 break;
+    proxy_pass http://$upstream_qbittorrent:8080;
+
+    proxy_set_header Referer '';
+    proxy_set_header Host $upstream_qbittorrent:8080;
+}
+
+location ^~ /qbittorrent/sync {
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_qbittorrent qbittorrent;
+    rewrite /qbittorrent(.*) $1 break;
+    proxy_pass http://$upstream_qbittorrent:8080;
+
+    proxy_set_header Referer '';
+    proxy_set_header Host $upstream_qbittorrent:8080;
+}

From 87272296f06182a50f6a47e46bad6c350b762657 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Thu, 8 Aug 2019 11:31:14 -0400
Subject: [PATCH 008/126] Create freshrss.subfolder.conf.sample

---
 freshrss.subfolder.conf.sample | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 freshrss.subfolder.conf.sample

diff --git a/freshrss.subfolder.conf.sample b/freshrss.subfolder.conf.sample
new file mode 100644
index 0000000..a13613b
--- /dev/null
+++ b/freshrss.subfolder.conf.sample
@@ -0,0 +1,27 @@
+# freshrss does not have a base url setting
+
+location /freshrss {
+    return 301 $scheme://$host/ombi/;
+}
+
+location ^~ /freshrss/ {
+    # enable the next two lines for http auth
+    #auth_basic "Restricted";
+    #auth_basic_user_file /config/nginx/.htpasswd;
+
+    # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
+    #auth_request /auth;
+    #error_page 401 =200 /login;
+
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_freshrss freshrss;
+    proxy_pass http://$upstream_freshrss:80;
+    
+    proxy_redirect off;
+    proxy_buffering off;
+    proxy_set_header X-Forwarded-Port $server_port;
+    proxy_cookie_path / "/; HTTPOnly; Secure";
+    proxy_set_header Authorization $http_authorization;
+    proxy_pass_header Authorization;
+}

From 1e81091ab738c19d8df2f480ea50a908756007e3 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Thu, 8 Aug 2019 11:40:11 -0400
Subject: [PATCH 009/126] add rewrite

---
 freshrss.subfolder.conf.sample | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/freshrss.subfolder.conf.sample b/freshrss.subfolder.conf.sample
index a13613b..020eac5 100644
--- a/freshrss.subfolder.conf.sample
+++ b/freshrss.subfolder.conf.sample
@@ -1,7 +1,7 @@
 # freshrss does not have a base url setting
 
 location /freshrss {
-    return 301 $scheme://$host/ombi/;
+    return 301 $scheme://$host/freshrss/;
 }
 
 location ^~ /freshrss/ {
@@ -16,6 +16,7 @@ location ^~ /freshrss/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_freshrss freshrss;
+    rewrite /freshrss(.*) $1 break;
     proxy_pass http://$upstream_freshrss:80;
     
     proxy_redirect off;

From 12bd8f461230934a23a0299d3a2395f92615cb3c Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Thu, 8 Aug 2019 11:51:14 -0400
Subject: [PATCH 010/126] Create freshrss.subdomain.conf.sample

---
 freshrss.subdomain.conf.sample | 37 ++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 freshrss.subdomain.conf.sample

diff --git a/freshrss.subdomain.conf.sample b/freshrss.subdomain.conf.sample
new file mode 100644
index 0000000..2616898
--- /dev/null
+++ b/freshrss.subdomain.conf.sample
@@ -0,0 +1,37 @@
+# make sure that your dns has a cname set for freshrss
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name freshrss.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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_freshrss freshrss;
+        proxy_pass http://$upstream_freshrss;
+        
+        proxy_redirect off;
+        proxy_buffering off;
+        proxy_set_header X-Forwarded-Port $server_port;
+        proxy_cookie_path / "/; HTTPOnly; Secure";
+        proxy_set_header Authorization $http_authorization;
+        proxy_pass_header Authorization;
+    }
+}

From 57fe1d27258f22be0ad48afda323edcde6c4e1fe Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Sat, 10 Aug 2019 16:52:47 -0400
Subject: [PATCH 011/126] Update freshrss.subdomain.conf.sample

---
 freshrss.subdomain.conf.sample | 1 +
 1 file changed, 1 insertion(+)

diff --git a/freshrss.subdomain.conf.sample b/freshrss.subdomain.conf.sample
index 2616898..9ca07fc 100644
--- a/freshrss.subdomain.conf.sample
+++ b/freshrss.subdomain.conf.sample
@@ -29,6 +29,7 @@ server {
         
         proxy_redirect off;
         proxy_buffering off;
+        proxy_set_header Host $host;
         proxy_set_header X-Forwarded-Port $server_port;
         proxy_cookie_path / "/; HTTPOnly; Secure";
         proxy_set_header Authorization $http_authorization;

From 573aa00c17095541a11e53a56ff186430c9b7da8 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Sat, 10 Aug 2019 16:53:20 -0400
Subject: [PATCH 012/126] Update freshrss.subfolder.conf.sample

---
 freshrss.subfolder.conf.sample | 1 +
 1 file changed, 1 insertion(+)

diff --git a/freshrss.subfolder.conf.sample b/freshrss.subfolder.conf.sample
index 020eac5..ab46adc 100644
--- a/freshrss.subfolder.conf.sample
+++ b/freshrss.subfolder.conf.sample
@@ -21,6 +21,7 @@ location ^~ /freshrss/ {
     
     proxy_redirect off;
     proxy_buffering off;
+    proxy_set_header Host $host;
     proxy_set_header X-Forwarded-Port $server_port;
     proxy_cookie_path / "/; HTTPOnly; Secure";
     proxy_set_header Authorization $http_authorization;

From 87b1485bc7bc091d6a9ff58cffc6b3e50fa5d309 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Mon, 12 Aug 2019 08:53:22 -0500
Subject: [PATCH 013/126] Add missing hydra2 api endpoints

---
 nzbhydra.subdomain.conf.sample | 15 +++++++++++++++
 nzbhydra.subfolder.conf.sample | 14 ++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/nzbhydra.subdomain.conf.sample b/nzbhydra.subdomain.conf.sample
index 7f7e22c..7b18fe2 100644
--- a/nzbhydra.subdomain.conf.sample
+++ b/nzbhydra.subdomain.conf.sample
@@ -34,4 +34,19 @@ server {
         set $upstream_nzbhydra hydra2;
         proxy_pass http://$upstream_nzbhydra:5076;
     }
+
+    location ~ (/nzbhydra)?/getnzb {
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_nzbhydra hydra2;
+        proxy_pass http://$upstream_nzbhydra:5076;
+    }
+
+    location ~ (/nzbhydra)?/torznab/api {
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_nzbhydra hydra2;
+        proxy_pass http://$upstream_nzbhydra:5076;
+    }
+
 }
diff --git a/nzbhydra.subfolder.conf.sample b/nzbhydra.subfolder.conf.sample
index 05d8528..d17eed4 100644
--- a/nzbhydra.subfolder.conf.sample
+++ b/nzbhydra.subfolder.conf.sample
@@ -21,3 +21,17 @@ location ^~ /nzbhydra/api {
     set $upstream_nzbhydra hydra2;
     proxy_pass http://$upstream_nzbhydra:5076;
 }
+
+location /nzbhydra/getnzb {
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_nzbhydra hydra2;
+    proxy_pass http://$upstream_nzbhydra:5076;
+}
+
+location /nzbhydra/torznab/api {
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_nzbhydra hydra2;
+    proxy_pass http://$upstream_nzbhydra:5076;
+}

From daba88850e26265d734548f793853b2154a48842 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Mon, 12 Aug 2019 15:17:10 -0400
Subject: [PATCH 014/126] add notice to broken config

---
 plex.subfolder.conf.sample | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plex.subfolder.conf.sample b/plex.subfolder.conf.sample
index 9b7c7fd..130a500 100644
--- a/plex.subfolder.conf.sample
+++ b/plex.subfolder.conf.sample
@@ -1,3 +1,5 @@
+#******** This config no longer works, use the subdomain config in the meantime *******
+
 # plex does not require a base url setting
 # if plex is running in bridge mode, the below config should work as is.
 # for host mode, replace the line "proxy_pass http://$upstream_plex:32400;" with "proxy_pass http://HOSTIP:32400;" HOSTIP being the IP address of plex

From 968e45fb7257136482f759a978eda7a19cc2e3cd Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Mon, 12 Aug 2019 21:45:27 -0400
Subject: [PATCH 015/126] Update plex.subfolder.conf.sample

---
 plex.subfolder.conf.sample | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plex.subfolder.conf.sample b/plex.subfolder.conf.sample
index 130a500..ac35467 100644
--- a/plex.subfolder.conf.sample
+++ b/plex.subfolder.conf.sample
@@ -1,4 +1,5 @@
-#******** This config no longer works, use the subdomain config in the meantime *******
+#******** This config no longer works as intended. The web app loads, but no direct connection to server is made. *********
+#******** PRs welcome for anyone who figures out how to fix it. Use the subdomain config in the meantime. *******
 
 # plex does not require a base url setting
 # if plex is running in bridge mode, the below config should work as is.

From f3f0b40509445d5106ecf459aeb7c398566285ab Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Thu, 15 Aug 2019 20:02:08 -0500
Subject: [PATCH 016/126] More hydra2 endpoints

---
 nzbhydra.subdomain.conf.sample | 14 ++++++++++++++
 nzbhydra.subfolder.conf.sample | 18 ++++++++++++++++--
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/nzbhydra.subdomain.conf.sample b/nzbhydra.subdomain.conf.sample
index 7b18fe2..cbca73a 100644
--- a/nzbhydra.subdomain.conf.sample
+++ b/nzbhydra.subdomain.conf.sample
@@ -42,6 +42,20 @@ server {
         proxy_pass http://$upstream_nzbhydra:5076;
     }
 
+    location ~ (/nzbhydra)?/gettorrent {
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_nzbhydra hydra2;
+        proxy_pass http://$upstream_nzbhydra:5076;
+    }
+
+    location ~ (/nzbhydra)?/rss {
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_nzbhydra hydra2;
+        proxy_pass http://$upstream_nzbhydra:5076;
+    }
+
     location ~ (/nzbhydra)?/torznab/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
diff --git a/nzbhydra.subfolder.conf.sample b/nzbhydra.subfolder.conf.sample
index d17eed4..cc36302 100644
--- a/nzbhydra.subfolder.conf.sample
+++ b/nzbhydra.subfolder.conf.sample
@@ -22,14 +22,28 @@ location ^~ /nzbhydra/api {
     proxy_pass http://$upstream_nzbhydra:5076;
 }
 
-location /nzbhydra/getnzb {
+location ^~ /nzbhydra/getnzb {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_nzbhydra hydra2;
     proxy_pass http://$upstream_nzbhydra:5076;
 }
 
-location /nzbhydra/torznab/api {
+location ^~ /nzbhydra/gettorrent {
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_nzbhydra hydra2;
+    proxy_pass http://$upstream_nzbhydra:5076;
+}
+
+location ^~ /nzbhydra/rss {
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_nzbhydra hydra2;
+    proxy_pass http://$upstream_nzbhydra:5076;
+}
+
+location ^~ /nzbhydra/torznab/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_nzbhydra hydra2;

From 918c263bddca13d57e8e0af5633709dfdb0648b8 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Sat, 17 Aug 2019 15:59:28 -0400
Subject: [PATCH 017/126] Create adguard.subdomain.conf.sample

---
 adguard.subdomain.conf.sample | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 adguard.subdomain.conf.sample

diff --git a/adguard.subdomain.conf.sample b/adguard.subdomain.conf.sample
new file mode 100644
index 0000000..0f27026
--- /dev/null
+++ b/adguard.subdomain.conf.sample
@@ -0,0 +1,30 @@
+# make sure that your dns has a cname set for adguard and that your adguard container is named adguard
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name adguard.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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_adguard adguard;
+        proxy_pass http://$upstream_adguard;
+    }
+}

From 3496d47e0c3fa5212af91036aa3a155a5276f19b Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Wed, 21 Aug 2019 11:37:36 -0400
Subject: [PATCH 018/126] Create piwigo.subdomain.conf.sample

---
 piwigo.subdomain.conf.sample | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 piwigo.subdomain.conf.sample

diff --git a/piwigo.subdomain.conf.sample b/piwigo.subdomain.conf.sample
new file mode 100644
index 0000000..b7e4a00
--- /dev/null
+++ b/piwigo.subdomain.conf.sample
@@ -0,0 +1,30 @@
+# make sure that your dns has a cname set for piwigo
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name piwigo.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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_piwigo piwigo;
+        proxy_pass http://$upstream_piwigo;
+    }
+}

From 6c344216830f993a57e358bb4c2226d501e690fd Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Wed, 21 Aug 2019 11:56:39 -0400
Subject: [PATCH 019/126] Create lychee.subdomain.conf.sample

---
 lychee.subdomain.conf.sample | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 lychee.subdomain.conf.sample

diff --git a/lychee.subdomain.conf.sample b/lychee.subdomain.conf.sample
new file mode 100644
index 0000000..32a0584
--- /dev/null
+++ b/lychee.subdomain.conf.sample
@@ -0,0 +1,30 @@
+# make sure that your dns has a cname set for lychee
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name lychee.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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_lychee lychee;
+        proxy_pass http://$upstream_lychee;
+    }
+}

From 7d68c0ebdba706ed44f3d3d25b970ed21a56158a Mon Sep 17 00:00:00 2001
From: Dreytac <dreytac@hobbyhome.net>
Date: Thu, 3 Oct 2019 20:30:55 +1000
Subject: [PATCH 020/126] Fix tt-rss subdomain redirection

---
 tt-rss.subdomain.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tt-rss.subdomain.conf.sample b/tt-rss.subdomain.conf.sample
index bc6a66c..8ab6fd9 100644
--- a/tt-rss.subdomain.conf.sample
+++ b/tt-rss.subdomain.conf.sample
@@ -4,7 +4,7 @@
 server {
     listen 80;
         server_name tt-rss.*;
-        return 301 https://$server_name$request_uri;
+        return 301 https://$host$request_uri;
 }
 
 server {

From c0d04a8f14f382ead60c77401c51f084a7a67e94 Mon Sep 17 00:00:00 2001
From: Dreytac <dreytac@hobbyhome.net>
Date: Mon, 7 Oct 2019 19:09:53 +1000
Subject: [PATCH 021/126] Remove port 80 redirect.

---
 tt-rss.subdomain.conf.sample | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tt-rss.subdomain.conf.sample b/tt-rss.subdomain.conf.sample
index 8ab6fd9..3f7b358 100644
--- a/tt-rss.subdomain.conf.sample
+++ b/tt-rss.subdomain.conf.sample
@@ -1,12 +1,6 @@
 # make sure that your dns has a cname set for tt-rss and your container name is tt-rss
 # In tt-rss config.php the SELF_URL_PATH should be set to http://tt-rss.server.com/ NOT https://tt-rss.server.com although it will be accessible on https://tt-rss.server.com
 
-server {
-    listen 80;
-        server_name tt-rss.*;
-        return 301 https://$host$request_uri;
-}
-
 server {
     listen 443 ssl;
     listen [::]:443 ssl;

From d32f15badc5cbc1321aa929d8e304f4a06e02f9b Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Wed, 9 Oct 2019 19:45:11 -0400
Subject: [PATCH 022/126] Create embystat.subdomain.conf.sample

---
 embystat.subdomain.conf.sample | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 embystat.subdomain.conf.sample

diff --git a/embystat.subdomain.conf.sample b/embystat.subdomain.conf.sample
new file mode 100644
index 0000000..b0405fd
--- /dev/null
+++ b/embystat.subdomain.conf.sample
@@ -0,0 +1,30 @@
+# make sure that your dns has a cname set for embystat
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name embystat.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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_embystat embystat;
+        proxy_pass http://$upstream_embystat:6555;
+    }
+}

From 1aa45021cb2f5c6ae3b34b52882ec4a48f355ce7 Mon Sep 17 00:00:00 2001
From: "R. Aaron JOhnson" <raaronjohnson@gmail.com>
Date: Thu, 17 Oct 2019 00:14:59 -0600
Subject: [PATCH 023/126] Update sabnzbd.subdomain.conf.sample

sabnzbd introduced hostname verification in 2.3.3  It is now  necessary to add the external URL to the "host_whitelist" or you'll get an error upon loading linuxserver/sabnzbd container using the sabnzbd.subdomain.conf configuration.
https://sabnzbd.org/wiki/extra/hostname-check.html
---
 sabnzbd.subdomain.conf.sample | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sabnzbd.subdomain.conf.sample b/sabnzbd.subdomain.conf.sample
index d74d380..dcfdcd0 100644
--- a/sabnzbd.subdomain.conf.sample
+++ b/sabnzbd.subdomain.conf.sample
@@ -1,4 +1,6 @@
 # make sure that your dns has a cname set for sabnzbd
+# edit the sabnzbd.ini to sub.domain.tld to the host_whitelist to avoid hostname verification issues. This format:
+# host_whitelist = sabnzbd.domain.com, www.sabnzbd.domain.com
 
 server {
     listen 443 ssl;

From e2f4bb469effb296235bef0d42dac06f4c703a20 Mon Sep 17 00:00:00 2001
From: "R. Aaron JOhnson" <raaronjohnson@gmail.com>
Date: Thu, 17 Oct 2019 00:37:09 -0600
Subject: [PATCH 024/126] Update sabnzbd.subdomain.conf.sample

---
 sabnzbd.subdomain.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sabnzbd.subdomain.conf.sample b/sabnzbd.subdomain.conf.sample
index dcfdcd0..1de40cc 100644
--- a/sabnzbd.subdomain.conf.sample
+++ b/sabnzbd.subdomain.conf.sample
@@ -1,5 +1,5 @@
 # make sure that your dns has a cname set for sabnzbd
-# edit the sabnzbd.ini to sub.domain.tld to the host_whitelist to avoid hostname verification issues. This format:
+# edit the sabnzbd.ini host_whitelist to avoid hostname verification issues. This format:
 # host_whitelist = sabnzbd.domain.com, www.sabnzbd.domain.com
 
 server {

From d84249cee6c993c08907cd5e6c555c43890bc613 Mon Sep 17 00:00:00 2001
From: "J. Scott Elblein" <elbleins+gitkraken@gmail.com>
Date: Tue, 3 Dec 2019 01:56:42 -0600
Subject: [PATCH 025/126] Create dozzle.subfolder.conf.sample,
 scope.subfolder.sample and jenkins.subfolder.conf.sample:

Settings taken from: https://wiki.jenkins.io/display/JENKINS/Jenkins+behind+an+NGinX+reverse+proxy

(Also has settings for a Subdomain sample if ya want)
---
 dozzle.subfolder.conf.sample  |  2 +-
 jenkins.subfolder.conf.sample | 29 +++++++++++++++++++++++++++++
 scope.subfolder.conf.sample   | 22 ++++++++++++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 jenkins.subfolder.conf.sample
 create mode 100644 scope.subfolder.conf.sample

diff --git a/dozzle.subfolder.conf.sample b/dozzle.subfolder.conf.sample
index b46294d..d37073a 100644
--- a/dozzle.subfolder.conf.sample
+++ b/dozzle.subfolder.conf.sample
@@ -1,7 +1,7 @@
 # First either add "--base /dozzle" or "-e DOZZLE_BASE=/dozzle" to your docker run command, and restart the Dozzle container
 
 location /dozzle {
-    return 301 $scheme://$http_host/dozzle/;
+    return 301 $scheme://$host/dozzle/;
 }
 location ^~ /dozzle/ {
     # enable the next two lines for http auth
diff --git a/jenkins.subfolder.conf.sample b/jenkins.subfolder.conf.sample
new file mode 100644
index 0000000..3593239
--- /dev/null
+++ b/jenkins.subfolder.conf.sample
@@ -0,0 +1,29 @@
+# First either add '--prefix=/jenkins' or '-e JENKINS_OPTS="--prefix=/jenkins"' to your docker run command, and restart the Jenkins container.
+# Also be sure to add '/jenkins/' to your URL under: Jenkins > Configuration > Manage Jenkins > Jenkins URL
+
+location /jenkins {
+    return 301 $scheme://$host/jenkins/;
+}
+location ^~ /jenkins/ {
+    # enable the next two lines for http auth
+    #auth_basic "Restricted";
+    #auth_basic_user_file /config/nginx/.htpasswd;
+
+    # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
+    #auth_request /auth;
+    #error_page 401 =200 /login;
+
+	# This is the maximum upload size
+	client_max_body_size 10m;
+
+	sendfile off;
+   
+    include /config/nginx/proxy.conf;
+    proxy_max_temp_file_size 0;
+    proxy_temp_file_write_size 64k;
+    proxy_request_buffering off;
+    proxy_buffering off;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_jenkins jenkins;    
+    proxy_pass http://$upstream_jenkins:8080;
+}
\ No newline at end of file
diff --git a/scope.subfolder.conf.sample b/scope.subfolder.conf.sample
new file mode 100644
index 0000000..193c35a
--- /dev/null
+++ b/scope.subfolder.conf.sample
@@ -0,0 +1,22 @@
+# Scope does not require a base url setting
+
+location /scope {
+    return 301 $scheme://$host/scope/;
+}
+location ^~ /scope/ {
+    # enable the next two lines for http auth
+    #auth_basic "Restricted";
+    #auth_basic_user_file /config/nginx/.htpasswd;
+
+    # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
+    #auth_request /auth;
+    #error_page 401 =200 /login;
+
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_scope scope;
+    rewrite /scope(.*) $1 break;
+    proxy_pass http://$upstream_scope:4040;
+    proxy_set_header Upgrade $http_upgrade;
+	proxy_set_header Connection "upgrade";
+}
\ No newline at end of file

From 2d12d467d23c348422a2b674c2a54d00dc279e42 Mon Sep 17 00:00:00 2001
From: cerdelyan <46970453+cerdelyan@users.noreply.github.com>
Date: Fri, 27 Dec 2019 13:57:51 -0600
Subject: [PATCH 026/126] nginx threw up error, fixed websocket

Changed from /embywebsocket to /socket
https://jellyfin.org/docs/general/administration/reverse-proxy.html
---
 jellyfin.subdomain.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jellyfin.subdomain.conf.sample b/jellyfin.subdomain.conf.sample
index 2cd6a06..7384e6c 100644
--- a/jellyfin.subdomain.conf.sample
+++ b/jellyfin.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
         proxy_set_header If-Range $http_if_range;
     }
 	
-    location ~ (/jellyfin)?/embywebsocket {
+    location ~ (/jellyfin)?/socket {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_jellyfin jellyfin;

From 3776c3c0836cb8d60ebc3615c22682db584f90b1 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Mon, 30 Dec 2019 11:40:02 -0500
Subject: [PATCH 027/126] Add info on bitwarden container name

---
 bitwarden.subdomain.conf.sample | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bitwarden.subdomain.conf.sample b/bitwarden.subdomain.conf.sample
index 9c5944f..77a7db3 100644
--- a/bitwarden.subdomain.conf.sample
+++ b/bitwarden.subdomain.conf.sample
@@ -1,4 +1,5 @@
 # make sure that your dns has a cname set for bitwarden and that your bitwarden container is not using a base url
+# make sure your bitwarden container is named "bitwarden"
 
 server {
     listen 443 ssl;

From 94cdd04a566e910b629ff644c28d4690a8620be9 Mon Sep 17 00:00:00 2001
From: drizuid <40674481+drizuid@users.noreply.github.com>
Date: Wed, 1 Jan 2020 12:34:37 -0500
Subject: [PATCH 028/126] removed redundant resolver line

removed redundant resolver 127.0.0.11 valid=30s; from server block. It's already in ssl.conf which is included via line 9
---
 collabora.subdomain.conf.sample | 1 -
 1 file changed, 1 deletion(-)

diff --git a/collabora.subdomain.conf.sample b/collabora.subdomain.conf.sample
index 706e2c0..ac421c0 100644
--- a/collabora.subdomain.conf.sample
+++ b/collabora.subdomain.conf.sample
@@ -8,7 +8,6 @@ server {
 
     include /config/nginx/ssl.conf;
 
-    resolver 127.0.0.11 valid=30s;
     set $upstream_collabora collabora;
 
     # static files

From 8ce1523d9c79f6a308725e5586b65edd26c21830 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Sun, 5 Jan 2020 12:22:18 -0500
Subject: [PATCH 029/126] add resolver into location blocks to prevent
 duplicate error

---
 collabora.subdomain.conf.sample | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/collabora.subdomain.conf.sample b/collabora.subdomain.conf.sample
index ac421c0..3b260b7 100644
--- a/collabora.subdomain.conf.sample
+++ b/collabora.subdomain.conf.sample
@@ -8,28 +8,34 @@ server {
 
     include /config/nginx/ssl.conf;
 
-    set $upstream_collabora collabora;
-
     # static files
     location ^~ /loleaflet {
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_collabora collabora;
         proxy_pass https://$upstream_collabora: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;
         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;
         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;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "Upgrade";
@@ -39,12 +45,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;
         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;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "Upgrade";

From fc97bd0ae6450ead350dfa995a503aa0a61682c5 Mon Sep 17 00:00:00 2001
From: driz <40674481+drizuid@users.noreply.github.com>
Date: Sun, 5 Jan 2020 15:05:05 -0500
Subject: [PATCH 030/126] Create calibre-web.subdomain.conf.sample

---
 calibre-web.subdomain.conf.sample | 33 +++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 calibre-web.subdomain.conf.sample

diff --git a/calibre-web.subdomain.conf.sample b/calibre-web.subdomain.conf.sample
new file mode 100644
index 0000000..1a8ce5f
--- /dev/null
+++ b/calibre-web.subdomain.conf.sample
@@ -0,0 +1,33 @@
+# make sure that your dns has a cname set for calibre-web
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name calibre-web.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+	location / {
+		# enable the next two lines for http auth
+		#auth_basic "Restricted";
+		#auth_basic_user_file /config/nginx/.htpasswd;
+
+		# enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
+		#auth_request /auth;
+		#error_page 401 =200 /login;
+
+    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;
+		proxy_set_header Host $http_host;
+		proxy_set_header X-Scheme $scheme;
+		proxy_set_header X-Script-Name /calibre;
+	}
+}

From 3a65854339f63818469e850a8764894ba4540451 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Tue, 7 Jan 2020 12:55:56 -0600
Subject: [PATCH 031/126] Split organizr-auth into separate conf

---
 organizr-auth.subfolder.conf.sample | 36 +++++++++++++++++++++++++++++
 organizr.subdomain.conf.sample      | 20 ++--------------
 organizr.subfolder.conf.sample      | 21 ++---------------
 3 files changed, 40 insertions(+), 37 deletions(-)
 create mode 100644 organizr-auth.subfolder.conf.sample

diff --git a/organizr-auth.subfolder.conf.sample b/organizr-auth.subfolder.conf.sample
new file mode 100644
index 0000000..60c9725
--- /dev/null
+++ b/organizr-auth.subfolder.conf.sample
@@ -0,0 +1,36 @@
+# To use config this with subfolder proxies:
+#   Rename this file to organizr-auth.subfolder.conf
+#   Add one of the auth_request lines from the comments below
+#   ex:
+#     auth_request /auth-0;
+#
+# To use config this with subdomain proxies:
+#   Rename this file to organizr-auth.subfolder.conf (the subfolder file name is still used)
+#   Add the following line in your other subdomain proxy configs
+#     include /config/nginx/proxy-confs/organizr-auth.subfolder.conf;
+#   Add one of the auth_request lines from the comments below
+#   ex:
+#     include /config/nginx/proxy-confs/organizr-auth.subfolder.conf;
+#     auth_request /auth-0;
+
+location ~ /auth-([0-9]+) {
+    internal;
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_organizr organizr;
+    proxy_pass http://$upstream_organizr:80/api/?v1/auth&group=$1;
+    proxy_set_header Content-Length "";
+
+    # Do not uncomment the lines below, these are examples for usue in other proxy configs
+    #auth_request /auth-0;   #=Admin
+    #auth_request /auth-1;   #=Co-Admin
+    #auth_request /auth-2;   #=Super User
+    #auth_request /auth-3;   #=Power User
+    #auth_request /auth-4;   #=User
+    #auth_request /auth-998; #=Logged In
+    #auth_request /auth-999; #=Guest
+}
+
+# Optional redirect server authentication errors to organizr authentication page
+# NOTE: $server_name must be modified to your public URL when using subdomain proxies
+#error_page 401 $scheme://$server_name/?error=$status&return=$request_uri;
diff --git a/organizr.subdomain.conf.sample b/organizr.subdomain.conf.sample
index 25710e0..d92b2bb 100644
--- a/organizr.subdomain.conf.sample
+++ b/organizr.subdomain.conf.sample
@@ -28,23 +28,7 @@ server {
         proxy_pass http://$upstream_organizr:80;
     }
 
-    location ~ /auth-(admin|user) {
-        # This is used for Organizr V1
-        internal;
-        include /config/nginx/proxy.conf;
-        resolver 127.0.0.11 valid=30s;
-        set $upstream_organizr organizr;
-        proxy_pass http://$upstream_organizr:80/auth.php?$1;
-        proxy_set_header Content-Length "";
-    }
+    # Optional redirect server errors to organizr error pages
+    #error_page 400 402 403 404 405 408 500 502 503 504  $scheme://$server_name/?error=$status;
 
-    location ~ /auth-([0-9]+) {
-        # This is used for Organizr V2
-        internal;
-        include /config/nginx/proxy.conf;
-        resolver 127.0.0.11 valid=30s;
-        set $upstream_organizr organizr;
-        proxy_pass http://$upstream_organizr:80/api/?v1/auth&group=$1;
-        proxy_set_header Content-Length "";
-    }
 }
diff --git a/organizr.subfolder.conf.sample b/organizr.subfolder.conf.sample
index ee66a12..8a0bba0 100644
--- a/organizr.subfolder.conf.sample
+++ b/organizr.subfolder.conf.sample
@@ -15,22 +15,5 @@ location / {
     proxy_pass http://$upstream_organizr:80;
 }
 
-location ~ /auth-(admin|user) {
-    # This is used for Organizr V1
-    internal;
-    include /config/nginx/proxy.conf;
-    resolver 127.0.0.11 valid=30s;
-    set $upstream_organizr organizr;
-    proxy_pass http://$upstream_organizr:80/auth.php?$1;
-    proxy_set_header Content-Length "";
-}
-
-location ~ /auth-([0-9]+) {
-    # This is used for Organizr V2
-    internal;
-    include /config/nginx/proxy.conf;
-    resolver 127.0.0.11 valid=30s;
-    set $upstream_organizr organizr;
-    proxy_pass http://$upstream_organizr:80/api/?v1/auth&group=$1;
-    proxy_set_header Content-Length "";
-}
+# Optional redirect server errors to organizr error pages
+#error_page 400 402 403 404 405 408 500 502 503 504  $scheme://$server_name/?error=$status;

From 3517c46c03a55813c652fef544cf3611bb13cef1 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Tue, 7 Jan 2020 13:14:57 -0600
Subject: [PATCH 032/126] Use host instead of server_name

---
 organizr-auth.subfolder.conf.sample | 4 ++--
 organizr.subdomain.conf.sample      | 2 +-
 organizr.subfolder.conf.sample      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/organizr-auth.subfolder.conf.sample b/organizr-auth.subfolder.conf.sample
index 60c9725..849b264 100644
--- a/organizr-auth.subfolder.conf.sample
+++ b/organizr-auth.subfolder.conf.sample
@@ -32,5 +32,5 @@ location ~ /auth-([0-9]+) {
 }
 
 # Optional redirect server authentication errors to organizr authentication page
-# NOTE: $server_name must be modified to your public URL when using subdomain proxies
-#error_page 401 $scheme://$server_name/?error=$status&return=$request_uri;
+# NOTE: $host must be modified to your public URL when using subdomain proxies
+#error_page 401 $scheme://$host/?error=$status&return=$request_uri;
diff --git a/organizr.subdomain.conf.sample b/organizr.subdomain.conf.sample
index d92b2bb..496af32 100644
--- a/organizr.subdomain.conf.sample
+++ b/organizr.subdomain.conf.sample
@@ -29,6 +29,6 @@ server {
     }
 
     # Optional redirect server errors to organizr error pages
-    #error_page 400 402 403 404 405 408 500 502 503 504  $scheme://$server_name/?error=$status;
+    #error_page 400 402 403 404 405 408 500 502 503 504  $scheme://$host/?error=$status;
 
 }
diff --git a/organizr.subfolder.conf.sample b/organizr.subfolder.conf.sample
index 8a0bba0..4cad9f2 100644
--- a/organizr.subfolder.conf.sample
+++ b/organizr.subfolder.conf.sample
@@ -16,4 +16,4 @@ location / {
 }
 
 # Optional redirect server errors to organizr error pages
-#error_page 400 402 403 404 405 408 500 502 503 504  $scheme://$server_name/?error=$status;
+#error_page 400 402 403 404 405 408 500 502 503 504  $scheme://$host/?error=$status;

From feb43c961563b1452c68f3ae99af77dd9e538abb Mon Sep 17 00:00:00 2001
From: driz <40674481+drizuid@users.noreply.github.com>
Date: Wed, 8 Jan 2020 13:08:18 -0500
Subject: [PATCH 033/126] remove X-Script_Name

removed superfluous proxy_set_header X-Script-Name /calibre; which is not needed for subdomain.
---
 calibre-web.subdomain.conf.sample | 1 -
 1 file changed, 1 deletion(-)

diff --git a/calibre-web.subdomain.conf.sample b/calibre-web.subdomain.conf.sample
index 1a8ce5f..5754dc2 100644
--- a/calibre-web.subdomain.conf.sample
+++ b/calibre-web.subdomain.conf.sample
@@ -28,6 +28,5 @@ server {
 		proxy_pass http://$upstream_calibre_web:8083;
 		proxy_set_header Host $http_host;
 		proxy_set_header X-Scheme $scheme;
-		proxy_set_header X-Script-Name /calibre;
 	}
 }

From 6096235a4585db022ec11bda8a621ba8d2888b46 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Mon, 6 Jan 2020 18:11:30 -0500
Subject: [PATCH 034/126] Create librespeed.subdomain.com.sample

---
 librespeed.subdomain.com.sample | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 librespeed.subdomain.com.sample

diff --git a/librespeed.subdomain.com.sample b/librespeed.subdomain.com.sample
new file mode 100644
index 0000000..65836a6
--- /dev/null
+++ b/librespeed.subdomain.com.sample
@@ -0,0 +1,30 @@
+# make sure that your dns has a cname set for librespeed
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name librespeed.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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_librespeed librespeed;
+        proxy_pass http://$upstream_librespeed;
+    }
+}

From e951fb77f46067a6a3b332f568a108af451b0b55 Mon Sep 17 00:00:00 2001
From: driz <40674481+drizuid@users.noreply.github.com>
Date: Mon, 13 Jan 2020 12:01:39 -0500
Subject: [PATCH 035/126] Create openvpn-as.subdomain.conf.sample

while testing it, i noticed one wasn't already here, so i threw this together.
---
 openvpn-as.subdomain.conf.sample | 46 ++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 openvpn-as.subdomain.conf.sample

diff --git a/openvpn-as.subdomain.conf.sample b/openvpn-as.subdomain.conf.sample
new file mode 100644
index 0000000..524cb12
--- /dev/null
+++ b/openvpn-as.subdomain.conf.sample
@@ -0,0 +1,46 @@
+# make sure that your dns has a cname set for openvpn-as and that your openvpn-as container is not using a base url
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name openvpn-as.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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_ovpn openvpn-as;
+        proxy_pass https://$upstream_ovpn:943;
+
+    }
+
+    location /admin {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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_ovpn openvpn-as;
+        proxy_pass https://$upstream_ovpn:943;
+    }
+}

From d6b659195eed4c609bc422614691a3b82443f6df Mon Sep 17 00:00:00 2001
From: Gideon Shaked <46572680+The-Kid-Gid@users.noreply.github.com>
Date: Sat, 1 Feb 2020 22:14:41 -0500
Subject: [PATCH 036/126] Create tdarr.subdomain.conf.sample

---
 tdarr.subdomain.conf.sample | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 tdarr.subdomain.conf.sample

diff --git a/tdarr.subdomain.conf.sample b/tdarr.subdomain.conf.sample
new file mode 100644
index 0000000..f76faf2
--- /dev/null
+++ b/tdarr.subdomain.conf.sample
@@ -0,0 +1,30 @@
+# make sure that your dns has a cname set for tdarr and that your tdarr container is not using a base url
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name tdarr.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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_tdarr tdarr;
+        proxy_pass http://$upstream_tdarr:8265;
+    }
+}

From 8c26fb72c779525edf0065ddd72fc9c7890e6fde Mon Sep 17 00:00:00 2001
From: GilbN <gilberg@gmail.com>
Date: Sat, 8 Feb 2020 16:32:26 +0100
Subject: [PATCH 037/126] Create ghost.subdomain.conf.sample

---
 ghost.subdomain.conf.sample | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 ghost.subdomain.conf.sample

diff --git a/ghost.subdomain.conf.sample b/ghost.subdomain.conf.sample
new file mode 100644
index 0000000..413f526
--- /dev/null
+++ b/ghost.subdomain.conf.sample
@@ -0,0 +1,31 @@
+# make sure that your dns has a cname set for ghost and that your ghost config is not using a subdirectory.
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name ghost.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    #enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        #enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        #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_ghost ghost;
+        proxy_pass http://$upstream_ghost:2368;
+        proxy_redirect off;	
+    }	
+}

From fb69f90727b6409f17ba18f613da59e9aa292084 Mon Sep 17 00:00:00 2001
From: GilbN <gilberg@gmail.com>
Date: Sat, 8 Feb 2020 16:35:17 +0100
Subject: [PATCH 038/126] Create ghost.subfolder.conf.sample

---
 ghost.subfolder.conf.sample | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 ghost.subfolder.conf.sample

diff --git a/ghost.subfolder.conf.sample b/ghost.subfolder.conf.sample
new file mode 100644
index 0000000..f35c8e4
--- /dev/null
+++ b/ghost.subfolder.conf.sample
@@ -0,0 +1,18 @@
+# Make sure you are using a subfolder in your ghost config file. https://ghost.org/docs/concepts/config/#url
+# Note: /ghost/ is by default used for the admin page. See https://ghost.org/docs/concepts/config/#admin-url
+
+location /blog {
+  # enable the next two lines for http auth
+  #uth_basic "Restricted";
+  #auth_basic_user_file /config/nginx/.htpasswd;
+
+  #enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
+  #auth_request /auth;
+  #error_page 401 =200 /login;
+	
+  include /config/nginx/proxy.conf;
+  resolver 127.0.0.11 valid=30s;
+  set $upstream_ghost ghost;
+  proxy_pass http://$upstream_ghost:2368;
+  proxy_redirect off;
+}

From cc33c4be4a1b026e6502cc0b31e6cb0ca3d33630 Mon Sep 17 00:00:00 2001
From: GilbN <gilberg@gmail.com>
Date: Sat, 8 Feb 2020 16:44:32 +0100
Subject: [PATCH 039/126] Update ghost.subfolder.conf.sample


From adc8c36703817419818425bc32e4eb37eb4712af Mon Sep 17 00:00:00 2001
From: Gideon Shaked <46572680+The-Kid-Gid@users.noreply.github.com>
Date: Thu, 13 Feb 2020 12:42:19 -0500
Subject: [PATCH 040/126] Create statping.subdomain.conf.sample

---
 statping.subdomain.conf.sample | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 statping.subdomain.conf.sample

diff --git a/statping.subdomain.conf.sample b/statping.subdomain.conf.sample
new file mode 100644
index 0000000..64b2e00
--- /dev/null
+++ b/statping.subdomain.conf.sample
@@ -0,0 +1,31 @@
+# make sure that your dns has a cname set for statping and that your statping container is not using a base url
+# the default url is status.yourdomain.tld, but you can change it to whatever you want
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name status.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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_statping statup;
+        proxy_pass http://$upstream_statping:8080;
+    }
+}

From 6a51a6aff3478dd6153af0cafd28b9d4033111a7 Mon Sep 17 00:00:00 2001
From: HalianElf <28244771+HalianElf@users.noreply.github.com>
Date: Fri, 14 Feb 2020 12:22:13 -0500
Subject: [PATCH 041/126] Update RPC endpoints

Allows credentials to be passed through the URL for apps like LunaSea
---
 nzbget.subfolder.conf.sample | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nzbget.subfolder.conf.sample b/nzbget.subfolder.conf.sample
index 0e19921..1238a88 100644
--- a/nzbget.subfolder.conf.sample
+++ b/nzbget.subfolder.conf.sample
@@ -1,6 +1,6 @@
 # nzbget does not require a base url setting
 
-location ^~ /nzbget {
+location /nzbget {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
     #auth_basic_user_file /config/nginx/.htpasswd;
@@ -15,21 +15,21 @@ location ^~ /nzbget {
     proxy_pass http://$upstream_nzbget:6789;
 }
 
-location ^~ /nzbget/jsonrpc {
+location ~ ^/nzbget(/.*)?/jsonrpc {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_nzbget nzbget;
     proxy_pass http://$upstream_nzbget:6789;
 }
 
-location ^~ /nzbget/jsonprpc {
+location ~ ^/nzbget(/.*)?/jsonprpc {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_nzbget nzbget;
     proxy_pass http://$upstream_nzbget:6789;
 }
 
-location ^~ /nzbget/xmlrpc {
+location ~ ^/nzbget(/.*)?/xmlrpc {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_nzbget nzbget;

From 0c5520e512b53b0af43f486b32d2af677a3c6ecc Mon Sep 17 00:00:00 2001
From: HalianElf <28244771+HalianElf@users.noreply.github.com>
Date: Fri, 14 Feb 2020 12:23:56 -0500
Subject: [PATCH 042/126] Update RPC endpoints

Allows credentials to be passed through the URL for apps like LunaSea
---
 nzbget.subdomain.conf.sample | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nzbget.subdomain.conf.sample b/nzbget.subdomain.conf.sample
index de33466..b5c45be 100644
--- a/nzbget.subdomain.conf.sample
+++ b/nzbget.subdomain.conf.sample
@@ -28,21 +28,21 @@ server {
         proxy_pass http://$upstream_nzbget:6789;
     }
 
-    location ^~ /nzbget/jsonrpc {
+    location ~ ^/nzbget(/.*)?/jsonrpc {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_nzbget nzbget;
         proxy_pass http://$upstream_nzbget:6789;
     }
 
-    location ^~ /nzbget/jsonprpc {
+    location ~ ^/nzbget(/.*)?/jsonprpc {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_nzbget nzbget;
         proxy_pass http://$upstream_nzbget:6789;
     }
 
-    location ^~ /nzbget/xmlrpc {
+    location ~ ^/nzbget(/.*)?/xmlrpc {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_nzbget nzbget;

From 7dd4185427a8635943dde4a47f1df51e38e4aa8e Mon Sep 17 00:00:00 2001
From: zellkou <zellkoubarzhad@gmail.com>
Date: Fri, 14 Feb 2020 19:01:22 -0500
Subject: [PATCH 043/126] added sample configs for booksonic

---
 booksonic.subdomain.conf.sample | 30 ++++++++++++++++++++++++++++++
 booksonic.subfolder.conf.sample | 16 ++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 booksonic.subdomain.conf.sample
 create mode 100644 booksonic.subfolder.conf.sample

diff --git a/booksonic.subdomain.conf.sample b/booksonic.subdomain.conf.sample
new file mode 100644
index 0000000..b123bbc
--- /dev/null
+++ b/booksonic.subdomain.conf.sample
@@ -0,0 +1,30 @@
+# make sure that your dns has a cname set for booksonic and that your booksonic container is not using a base url
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name booksonic.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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_booksonic booksonic;
+        proxy_pass http://$upstream_boksonic:4040;
+    }
+}
diff --git a/booksonic.subfolder.conf.sample b/booksonic.subfolder.conf.sample
new file mode 100644
index 0000000..ad2c2df
--- /dev/null
+++ b/booksonic.subfolder.conf.sample
@@ -0,0 +1,16 @@
+# set the CONTEXT_PATH variable to /booksonic in booksonic container.
+
+location ^~ /booksonic {
+    # enable the next two lines for http auth
+    #auth_basic "Restricted";
+    #auth_basic_user_file /config/nginx/.htpasswd;
+
+    # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
+    #auth_request /auth;
+    #error_page 401 =200 /login;
+
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_booksonic booksonic;
+    proxy_pass http://$upstream_booksonic:4040;
+}

From 1712bb6572dd85cde29e9da69f154c0e97bba852 Mon Sep 17 00:00:00 2001
From: HalianElf <28244771+HalianElf@users.noreply.github.com>
Date: Fri, 14 Feb 2020 21:41:51 -0500
Subject: [PATCH 044/126] Change regex

---
 nzbget.subdomain.conf.sample | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nzbget.subdomain.conf.sample b/nzbget.subdomain.conf.sample
index b5c45be..a7725c1 100644
--- a/nzbget.subdomain.conf.sample
+++ b/nzbget.subdomain.conf.sample
@@ -28,21 +28,21 @@ server {
         proxy_pass http://$upstream_nzbget:6789;
     }
 
-    location ~ ^/nzbget(/.*)?/jsonrpc {
+    location ~ (/nzbget)?(/[^\/:]*:[^\/:]*)?/jsonrpc {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_nzbget nzbget;
         proxy_pass http://$upstream_nzbget:6789;
     }
 
-    location ~ ^/nzbget(/.*)?/jsonprpc {
+    location ~ (/nzbget)?(/[^\/:]*:[^\/:]*)?/jsonprpc {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_nzbget nzbget;
         proxy_pass http://$upstream_nzbget:6789;
     }
 
-    location ~ ^/nzbget(/.*)?/xmlrpc {
+    location ~ (/nzbget)?(/[^\/:]*:[^\/:]*)?/xmlrpc {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_nzbget nzbget;

From c13e6f8f0f878a0d8e82660d12456eedce719f09 Mon Sep 17 00:00:00 2001
From: HalianElf <28244771+HalianElf@users.noreply.github.com>
Date: Fri, 14 Feb 2020 21:43:01 -0500
Subject: [PATCH 045/126] Change regex

---
 nzbget.subfolder.conf.sample | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nzbget.subfolder.conf.sample b/nzbget.subfolder.conf.sample
index 1238a88..1c17611 100644
--- a/nzbget.subfolder.conf.sample
+++ b/nzbget.subfolder.conf.sample
@@ -15,21 +15,21 @@ location /nzbget {
     proxy_pass http://$upstream_nzbget:6789;
 }
 
-location ~ ^/nzbget(/.*)?/jsonrpc {
+location ~ /nzbget(/[^\/:]*:[^\/:]*)?/jsonrpc {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_nzbget nzbget;
     proxy_pass http://$upstream_nzbget:6789;
 }
 
-location ~ ^/nzbget(/.*)?/jsonprpc {
+location ~ /nzbget(/[^\/:]*:[^\/:]*)?/jsonprpc {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_nzbget nzbget;
     proxy_pass http://$upstream_nzbget:6789;
 }
 
-location ~ ^/nzbget(/.*)?/xmlrpc {
+location ~ /nzbget(/[^\/:]*:[^\/:]*)?/xmlrpc {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_nzbget nzbget;

From e36e28adc7efaec077ea0707b17f414132e753fe Mon Sep 17 00:00:00 2001
From: HalianElf <28244771+HalianElf@users.noreply.github.com>
Date: Fri, 14 Feb 2020 22:04:44 -0500
Subject: [PATCH 046/126] Remove : from password

---
 nzbget.subfolder.conf.sample | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nzbget.subfolder.conf.sample b/nzbget.subfolder.conf.sample
index 1c17611..fd17df6 100644
--- a/nzbget.subfolder.conf.sample
+++ b/nzbget.subfolder.conf.sample
@@ -15,21 +15,21 @@ location /nzbget {
     proxy_pass http://$upstream_nzbget:6789;
 }
 
-location ~ /nzbget(/[^\/:]*:[^\/:]*)?/jsonrpc {
+location ~ /nzbget(/[^\/:]*:[^\/]*)?/jsonrpc {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_nzbget nzbget;
     proxy_pass http://$upstream_nzbget:6789;
 }
 
-location ~ /nzbget(/[^\/:]*:[^\/:]*)?/jsonprpc {
+location ~ /nzbget(/[^\/:]*:[^\/]*)?/jsonprpc {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_nzbget nzbget;
     proxy_pass http://$upstream_nzbget:6789;
 }
 
-location ~ /nzbget(/[^\/:]*:[^\/:]*)?/xmlrpc {
+location ~ /nzbget(/[^\/:]*:[^\/]*)?/xmlrpc {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_nzbget nzbget;

From 638eb59bd183f926f137f79aa0b8ac2a4663eebb Mon Sep 17 00:00:00 2001
From: HalianElf <28244771+HalianElf@users.noreply.github.com>
Date: Fri, 14 Feb 2020 22:05:17 -0500
Subject: [PATCH 047/126] Remove : from password

---
 nzbget.subdomain.conf.sample | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nzbget.subdomain.conf.sample b/nzbget.subdomain.conf.sample
index a7725c1..a3f4872 100644
--- a/nzbget.subdomain.conf.sample
+++ b/nzbget.subdomain.conf.sample
@@ -35,14 +35,14 @@ server {
         proxy_pass http://$upstream_nzbget:6789;
     }
 
-    location ~ (/nzbget)?(/[^\/:]*:[^\/:]*)?/jsonprpc {
+    location ~ (/nzbget)?(/[^\/:]*:[^\/]*)?/jsonprpc {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_nzbget nzbget;
         proxy_pass http://$upstream_nzbget:6789;
     }
 
-    location ~ (/nzbget)?(/[^\/:]*:[^\/:]*)?/xmlrpc {
+    location ~ (/nzbget)?(/[^\/:]*:[^\/]*)?/xmlrpc {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_nzbget nzbget;

From 23f9844ae66dd26bff9e354b05b098d86c5a6245 Mon Sep 17 00:00:00 2001
From: Gideon Shaked <46572680+The-Kid-Gid@users.noreply.github.com>
Date: Sat, 15 Feb 2020 13:09:18 -0500
Subject: [PATCH 048/126] Update statping.subdomain.conf.sample

---
 statping.subdomain.conf.sample | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/statping.subdomain.conf.sample b/statping.subdomain.conf.sample
index 64b2e00..f2a78b6 100644
--- a/statping.subdomain.conf.sample
+++ b/statping.subdomain.conf.sample
@@ -1,11 +1,12 @@
 # make sure that your dns has a cname set for statping and that your statping container is not using a base url
-# the default url is status.yourdomain.tld, but you can change it to whatever you want
+# If you are using the SSL docker-compose.yml on the statping repo, then the container name will be set to statup.
+# On other compose examples, it might be named statping. In that case, change $upstream_statping statup to $upstream_statping statping
 
 server {
     listen 443 ssl;
     listen [::]:443 ssl;
 
-    server_name status.*;
+    server_name statping.*;
 
     include /config/nginx/ssl.conf;
 

From bfb318c0418b66bac2e2963156420ffe56ad4ee0 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Sat, 15 Feb 2020 15:45:47 -0500
Subject: [PATCH 049/126] Update jellyfin.subfolder.conf.sample

---
 jellyfin.subfolder.conf.sample | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/jellyfin.subfolder.conf.sample b/jellyfin.subfolder.conf.sample
index e0141c3..14f41d7 100644
--- a/jellyfin.subfolder.conf.sample
+++ b/jellyfin.subfolder.conf.sample
@@ -1,7 +1,7 @@
 # if jellyfin is running in bridge mode, the below config should work as is, although, the container name is expected to be "jellyfin",
 # if not, replace the lines "set $upstream_jellyfin jellyfin;" with "set $upstream_jellyfin <containername>;"
 # for host mode, replace the lines "proxy_pass http://$upstream_jellyfin:8096;" with "proxy_pass http://HOSTIP:8096;" HOSTIP being the IP address of jellyfin
-# in jellyfin settings, under "Advanced" change the public https port to 443, leave the local ports as is, set the "external domain" to your url and subdomain,
+# in jellyfin settings, under "Advanced/Networking" change the public https port to 443, leave the local ports as is, set the base url to "/jellyfin",
 # and set the "Secure connection mode" to "Handled by reverse proxy"
 
 location /jellyfin {
@@ -11,7 +11,6 @@ location ^~ /jellyfin/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_jellyfin jellyfin;
-    rewrite /jellyfin(.*) $1 break;
     proxy_pass http://$upstream_jellyfin:8096;
     
     proxy_set_header Range $http_range;

From e295044af3a546700c751a8baf57c5f3615a305e Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Sat, 15 Feb 2020 17:19:05 -0500
Subject: [PATCH 050/126] Update jellyfin.subdomain.conf.sample (#122)

---
 jellyfin.subdomain.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jellyfin.subdomain.conf.sample b/jellyfin.subdomain.conf.sample
index 7384e6c..3d37bb1 100644
--- a/jellyfin.subdomain.conf.sample
+++ b/jellyfin.subdomain.conf.sample
@@ -1,7 +1,7 @@
 # make sure that your dns has a cname set for jellyfin, if jellyfin is running in bridge mode, the below config should work as is, although,
 # the container name is expected to be "jellyfin", if not, replace the lines "set $upstream_jellyfin jellyfin;" with "set $upstream_jellyfin <containername>;"
 # for host mode, replace the lines "proxy_pass http://$upstream_jellyfin:8096;" with "proxy_pass http://HOSTIP:8096;" HOSTIP being the IP address of jellyfin
-# in jellyfin settings, under "Advanced" change the public https port to 443, leave the local ports as is, set the "external domain" to your url,
+# in jellyfin settings, under "Advanced/Networking" change the public https port to 443, leave the local ports as is,
 # and set the "Secure connection mode" to "Handled by reverse proxy"
 
 server {

From 08dcd45e7898da6a2bb53ade6b2ee89b1adf9a15 Mon Sep 17 00:00:00 2001
From: zellkou <zellkoubarzhad@gmail.com>
Date: Sun, 16 Feb 2020 02:07:20 -0500
Subject: [PATCH 051/126] added osticket.subdomain.conf

---
 osticket.subdomain.conf.sample | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 osticket.subdomain.conf.sample

diff --git a/osticket.subdomain.conf.sample b/osticket.subdomain.conf.sample
new file mode 100644
index 0000000..9c4a580
--- /dev/null
+++ b/osticket.subdomain.conf.sample
@@ -0,0 +1,32 @@
+# make sure that your dns has a cname set for osticket and that your osticket container is named osticket.
+# change  the port number here to match the port you have the container on and you have set the "Helpdesk URL"
+# to help.youdomain.com:$port in Admin panel > Settings > System > Helpdesk URL
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name help.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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_osticket osticket;
+        proxy_pass http://$upstream_osticket:80;
+    }
+}

From 88133f06133e5379a29bee6195ebf868fef94b37 Mon Sep 17 00:00:00 2001
From: zellkou <zellkoubarzhad@gmail.com>
Date: Sun, 16 Feb 2020 12:34:58 -0500
Subject: [PATCH 052/126] removed confusing comment

---
 osticket.subdomain.conf.sample | 2 --
 1 file changed, 2 deletions(-)

diff --git a/osticket.subdomain.conf.sample b/osticket.subdomain.conf.sample
index 9c4a580..ea3c16f 100644
--- a/osticket.subdomain.conf.sample
+++ b/osticket.subdomain.conf.sample
@@ -1,6 +1,4 @@
 # make sure that your dns has a cname set for osticket and that your osticket container is named osticket.
-# change  the port number here to match the port you have the container on and you have set the "Helpdesk URL"
-# to help.youdomain.com:$port in Admin panel > Settings > System > Helpdesk URL
 
 server {
     listen 443 ssl;

From 9790176195d6ae39b59cc2d3c00ab99e803790f6 Mon Sep 17 00:00:00 2001
From: zellkou <zellkoubarzhad@gmail.com>
Date: Sun, 16 Feb 2020 13:00:58 -0500
Subject: [PATCH 053/126] changed subdomain name

---
 osticket.subdomain.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osticket.subdomain.conf.sample b/osticket.subdomain.conf.sample
index ea3c16f..a74de40 100644
--- a/osticket.subdomain.conf.sample
+++ b/osticket.subdomain.conf.sample
@@ -4,7 +4,7 @@ server {
     listen 443 ssl;
     listen [::]:443 ssl;
 
-    server_name help.*;
+    server_name osticket.*;
 
     include /config/nginx/ssl.conf;
 

From 06a1941230fcc7d5fe032dbbfad68c6e7a4775fa Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Sun, 16 Feb 2020 13:24:23 -0500
Subject: [PATCH 054/126] standardize upstream_app variable

---
 adguard.subdomain.conf.sample          |  4 +--
 adminer.subfolder.conf.sample          |  4 +--
 airsonic.subdomain.conf.sample         |  4 +--
 airsonic.subfolder.conf.sample         |  4 +--
 bazarr.subdomain.conf.sample           |  4 +--
 bazarr.subfolder.conf.sample           |  4 +--
 beets.subdomain.conf.sample            |  4 +--
 beets.subfolder.conf.sample            |  4 +--
 bitwarden.subdomain.conf.sample        | 12 ++++-----
 booksonic.subdomain.conf.sample        |  4 +--
 booksonic.subfolder.conf.sample        |  4 +--
 calibre-web.subdomain.conf.sample      |  4 +--
 calibre-web.subfolder.conf.sample      |  4 +--
 calibre.subdomain.conf.sample          |  4 +--
 calibre.subfolder.conf.sample          |  4 +--
 code-server.subdomain.conf.sample      |  4 +--
 codimd.subdomain.conf.sample           |  4 +--
 collabora.subdomain.conf.sample        | 24 ++++++++---------
 couchpotato.subdomain.conf.sample      |  4 +--
 couchpotato.subfolder.conf.sample      |  4 +--
 deluge.subdomain.conf.sample           |  4 +--
 deluge.subfolder.conf.sample           |  4 +--
 dillinger.subdomain.conf.sample        |  4 +--
 dokuwiki.subdomain.conf.sample         |  4 +--
 domoticz.subdomain.conf.sample         |  4 +--
 domoticz.subfolder.conf.sample         |  4 +--
 dozzle.subfolder.conf.sample           |  4 +--
 duplicati.subdomain.conf.sample        |  4 +--
 duplicati.subfolder.conf.sample        |  4 +--
 emby.subdomain.conf.sample             | 12 ++++-----
 emby.subfolder.conf.sample             | 12 ++++-----
 embystat.subdomain.conf.sample         |  4 +--
 flood.subdomain.conf.sample            |  4 +--
 flood.subfolder.conf.sample            |  4 +--
 freshrss.subdomain.conf.sample         |  4 +--
 freshrss.subfolder.conf.sample         |  4 +--
 ghost.subdomain.conf.sample            |  4 +--
 ghost.subfolder.conf.sample            |  4 +--
 gitea.subdomain.conf.sample            |  4 +--
 gitea.subfolder.conf.sample            |  4 +--
 glances.subdomain.conf.sample          |  4 +--
 glances.subfolder.conf.sample          |  4 +--
 grafana.subdomain.conf.sample          |  4 +--
 grocy.subdomain.conf.sample            |  4 +--
 guacamole.subdomain.conf.sample        |  4 +--
 guacamole.subfolder.conf.sample        |  4 +--
 headphones.subdomain.conf.sample       |  4 +--
 headphones.subfolder.conf.sample       |  4 +--
 heimdall.subdomain.conf.sample         |  4 +--
 heimdall.subfolder.conf.sample         |  4 +--
 homeassistant.subdomain.conf.sample    |  8 +++---
 jackett.subdomain.conf.sample          |  8 +++---
 jackett.subfolder.conf.sample          |  8 +++---
 jellyfin.subdomain.conf.sample         | 12 ++++-----
 jellyfin.subfolder.conf.sample         |  8 +++---
 jenkins.subfolder.conf.sample          |  4 +--
 kanzi.subdomain.conf.sample            |  4 +--
 kanzi.subfolder.conf.sample            |  4 +--
 lazylibrarian.subdomain.conf.sample    |  4 +--
 lazylibrarian.subfolder.conf.sample    |  4 +--
 librespeed.subdomain.com.sample        |  4 +--
 lidarr.subdomain.conf.sample           |  8 +++---
 lidarr.subfolder.conf.sample           |  8 +++---
 lychee.subdomain.conf.sample           |  4 +--
 medusa.subdomain.conf.sample           |  4 +--
 medusa.subfolder.conf.sample           |  4 +--
 monitorr.subdomain.conf.sample         |  4 +--
 monitorr.subfolder.conf.sample         |  4 +--
 mstream.subdomain.conf.sample          |  4 +--
 mylar.subdomain.conf.sample            |  4 +--
 mylar.subfolder.conf.sample            |  4 +--
 mytinytodo.subfolder.conf.sample       |  4 +--
 netdata.subdomain.conf.sample          |  4 +--
 netdata.subfolder.conf.sample          |  4 +--
 nextcloud.subdomain.conf.sample        |  4 +--
 nextcloud.subfolder.conf.sample        |  4 +--
 nzbget.subdomain.conf.sample           | 16 ++++++------
 nzbget.subfolder.conf.sample           | 16 ++++++------
 nzbhydra.subdomain.conf.sample         | 24 ++++++++---------
 nzbhydra.subfolder.conf.sample         | 24 ++++++++---------
 ombi.subdomain.conf.sample             | 12 ++++-----
 ombi.subfolder.conf.sample             | 12 ++++-----
 openvpn-as.subdomain.conf.sample       |  8 +++---
 organizr-auth.subfolder.conf.sample    |  4 +--
 organizr.subdomain.conf.sample         |  4 +--
 organizr.subfolder.conf.sample         |  4 +--
 osticket.subdomain.conf.sample         |  4 +--
 phpmyadmin.subdomain.conf.sample       |  4 +--
 phpmyadmin.subfolder.conf.sample       |  4 +--
 pihole.subdomain.conf.sample           |  8 +++---
 pihole.subfolder.conf.sample           |  8 +++---
 piwigo.subdomain.conf.sample           |  4 +--
 plex.subdomain.conf.sample             |  6 ++---
 plex.subfolder.conf.sample             |  6 ++---
 plexwebtools.subdomain.conf.sample     |  4 +--
 plexwebtools.subfolder.conf.sample     |  4 +--
 portainer.subdomain.conf.sample        |  8 +++---
 portainer.subfolder.conf.sample        |  8 +++---
 prometheus.subdomain.conf.sample       |  4 +--
 pydio.subdomain.conf.sample            |  4 +--
 pyload.subdomain.conf.sample           |  4 +--
 qbittorrent.subdomain.conf.sample      | 36 +++++++++++++-------------
 qbittorrent.subfolder.conf.sample      | 36 +++++++++++++-------------
 quassel-web.subdomain.conf.sample      |  4 +--
 quassel-web.subfolder.conf.sample      |  4 +--
 radarr.subdomain.conf.sample           |  8 +++---
 radarr.subfolder.conf.sample           |  8 +++---
 raneto.subdomain.conf.sample           |  4 +--
 resilio-sync.subdomain.conf.sample     |  4 +--
 rutorrent.subdomain.conf.sample        |  8 +++---
 rutorrent.subfolder.conf.sample        |  8 +++---
 sabnzbd.subdomain.conf.sample          |  8 +++---
 sabnzbd.subfolder.conf.sample          |  8 +++---
 scope.subfolder.conf.sample            |  4 +--
 sickrage.subdomain.conf.sample         |  4 +--
 sickrage.subfolder.conf.sample         |  4 +--
 smokeping.subdomain.conf.sample        |  4 +--
 smokeping.subfolder.conf.sample        |  4 +--
 sonarr.subdomain.conf.sample           |  8 +++---
 sonarr.subfolder.conf.sample           |  8 +++---
 statping.subdomain.conf.sample         |  6 ++---
 syncthing.subdomain.conf.sample        |  4 +--
 taisun.subdomain.conf.sample           |  4 +--
 tautulli.subdomain.conf.sample         |  8 +++---
 tautulli.subfolder.conf.sample         |  8 +++---
 tdarr.subdomain.conf.sample            |  4 +--
 thelounge.subdomain.conf.sample        |  4 +--
 thelounge.subfolder.conf.sample        |  4 +--
 transmission.subdomain.conf.sample     |  8 +++---
 transmission.subfolder.conf.sample     |  8 +++---
 tt-rss.subdomain.conf.sample           |  6 ++---
 ubooquity.subdomain.conf.sample        | 16 ++++++------
 ubooquity.subfolder.conf.sample        |  8 +++---
 unifi-controller.subdomain.conf.sample |  8 +++---
 znc.subdomain.conf.sample              |  4 +--
 znc.subfolder.conf.sample              |  4 +--
 136 files changed, 430 insertions(+), 430 deletions(-)

diff --git a/adguard.subdomain.conf.sample b/adguard.subdomain.conf.sample
index 0f27026..21c601c 100644
--- 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
index 73450f4..5d3545b 100644
--- 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
index 9c708da..605ee6e 100644
--- 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
index cda9808..e509e62 100644
--- 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
index 3f61b15..56306f8 100644
--- 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
index 50ac52a..9cff8f4 100644
--- 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
index 92a8327..4873170 100644
--- 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
index ebd20c4..3bfacb9 100644
--- 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
index 77a7db3..03112d0 100644
--- a/bitwarden.subdomain.conf.sample
+++ b/bitwarden.subdomain.conf.sample
@@ -25,15 +25,15 @@ 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";
     }
@@ -41,8 +41,8 @@ server {
     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
index b123bbc..01c4468 100644
--- 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
index ad2c2df..e205cee 100644
--- 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
index 5754dc2..6054790 100644
--- 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
index 6bd0fbc..1da0096 100644
--- 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
index af6a749..adb6373 100644
--- 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
index afc6a96..8b2bfac 100644
--- 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
index 65f7d86..0a7ce86 100644
--- 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
index bd47c7e..c051008 100644
--- 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;
     }
 }
\ No newline at end of file
diff --git a/collabora.subdomain.conf.sample b/collabora.subdomain.conf.sample
index 3b260b7..bfe53ee 100644
--- 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
index 609ff09..27a0288 100644
--- 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
index 99229d7..937a14f 100644
--- 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
index 8da04d0..b43cc3f 100644
--- 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
index f5004ef..d1f4f9a 100644
--- 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
index 33978f5..97f7a88 100644
--- 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;
     }
 }
\ No newline at end of file
diff --git a/dokuwiki.subdomain.conf.sample b/dokuwiki.subdomain.conf.sample
index 9a3d2ef..5f81c7f 100644
--- 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
index 1a28578..226e106 100644
--- 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;
     }
 }
\ No newline at end of file
diff --git a/domoticz.subfolder.conf.sample b/domoticz.subfolder.conf.sample
index 35e4423..c8a77fc 100644
--- 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
index d37073a..6fd4272 100644
--- 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
index 42ddd2c..f6dc7a7 100644
--- 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
index 1e65876..263f8a7 100644
--- 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
index fc11bf4..9efad40 100644
--- 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;
diff --git a/emby.subfolder.conf.sample b/emby.subfolder.conf.sample
index 1226ced..7d62fd5 100644
--- a/emby.subfolder.conf.sample
+++ b/emby.subfolder.conf.sample
@@ -1,6 +1,6 @@
 # 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
+# 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 subdomain,
 # and set the "Secure connection mode" to "Handled by reverse proxy"
 
@@ -10,8 +10,8 @@ location /emby {
 location ^~ /emby/ {
     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;
@@ -20,8 +20,8 @@ location ^~ /emby/ {
 location ^~ /embywebsocket {
     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;
diff --git a/embystat.subdomain.conf.sample b/embystat.subdomain.conf.sample
index b0405fd..b166cf8 100644
--- a/embystat.subdomain.conf.sample
+++ b/embystat.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_embystat embystat;
-        proxy_pass http://$upstream_embystat:6555;
+        set $upstream_app embystat;
+        proxy_pass http://$upstream_app:6555;
     }
 }
diff --git a/flood.subdomain.conf.sample b/flood.subdomain.conf.sample
index 3890d3b..0ab0f3c 100644
--- a/flood.subdomain.conf.sample
+++ b/flood.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_flood flood;
-        proxy_pass http://$upstream_flood:3000;
+        set $upstream_app flood;
+        proxy_pass http://$upstream_app:3000;
     }
 }
diff --git a/flood.subfolder.conf.sample b/flood.subfolder.conf.sample
index 90b5d76..caa98b4 100644
--- a/flood.subfolder.conf.sample
+++ b/flood.subfolder.conf.sample
@@ -14,7 +14,7 @@ location ^~ /flood/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_flood flood;
+    set $upstream_app flood;
     rewrite /flood(.*) $1 break;
-    proxy_pass http://$upstream_flood:3000;
+    proxy_pass http://$upstream_app:3000;
 }
diff --git a/freshrss.subdomain.conf.sample b/freshrss.subdomain.conf.sample
index 9ca07fc..aba0e34 100644
--- a/freshrss.subdomain.conf.sample
+++ b/freshrss.subdomain.conf.sample
@@ -24,8 +24,8 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_freshrss freshrss;
-        proxy_pass http://$upstream_freshrss;
+        set $upstream_app freshrss;
+        proxy_pass http://$upstream_app;
         
         proxy_redirect off;
         proxy_buffering off;
diff --git a/freshrss.subfolder.conf.sample b/freshrss.subfolder.conf.sample
index ab46adc..497f400 100644
--- a/freshrss.subfolder.conf.sample
+++ b/freshrss.subfolder.conf.sample
@@ -15,9 +15,9 @@ location ^~ /freshrss/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_freshrss freshrss;
+    set $upstream_app freshrss;
     rewrite /freshrss(.*) $1 break;
-    proxy_pass http://$upstream_freshrss:80;
+    proxy_pass http://$upstream_app:80;
     
     proxy_redirect off;
     proxy_buffering off;
diff --git a/ghost.subdomain.conf.sample b/ghost.subdomain.conf.sample
index 413f526..c6b38e4 100644
--- a/ghost.subdomain.conf.sample
+++ b/ghost.subdomain.conf.sample
@@ -24,8 +24,8 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_ghost ghost;
-        proxy_pass http://$upstream_ghost:2368;
+        set $upstream_app ghost;
+        proxy_pass http://$upstream_app:2368;
         proxy_redirect off;	
     }	
 }
diff --git a/ghost.subfolder.conf.sample b/ghost.subfolder.conf.sample
index f35c8e4..18491ee 100644
--- a/ghost.subfolder.conf.sample
+++ b/ghost.subfolder.conf.sample
@@ -12,7 +12,7 @@ location /blog {
 	
   include /config/nginx/proxy.conf;
   resolver 127.0.0.11 valid=30s;
-  set $upstream_ghost ghost;
-  proxy_pass http://$upstream_ghost:2368;
+  set $upstream_app ghost;
+  proxy_pass http://$upstream_app:2368;
   proxy_redirect off;
 }
diff --git a/gitea.subdomain.conf.sample b/gitea.subdomain.conf.sample
index 9f0fc6c..05d5dc3 100644
--- a/gitea.subdomain.conf.sample
+++ b/gitea.subdomain.conf.sample
@@ -30,7 +30,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_gitea gitea;
-        proxy_pass http://$upstream_gitea:3000;
+        set $upstream_app gitea;
+        proxy_pass http://$upstream_app:3000;
     }
 }
diff --git a/gitea.subfolder.conf.sample b/gitea.subfolder.conf.sample
index 03a477e..9b2aff0 100644
--- a/gitea.subfolder.conf.sample
+++ b/gitea.subfolder.conf.sample
@@ -11,7 +11,7 @@ location /gitea {
 location ^~ /gitea/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_gitea gitea;
+    set $upstream_app gitea;
     rewrite /gitea(.*) $1 break;
-    proxy_pass http://$upstream_gitea:3000;
+    proxy_pass http://$upstream_app:3000;
 }
diff --git a/glances.subdomain.conf.sample b/glances.subdomain.conf.sample
index c539f79..bbe846d 100644
--- a/glances.subdomain.conf.sample
+++ b/glances.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_glances glances;
-        proxy_pass http://$upstream_glances:61208;
+        set $upstream_app glances;
+        proxy_pass http://$upstream_app:61208;
     }
 }
diff --git a/glances.subfolder.conf.sample b/glances.subfolder.conf.sample
index 6637d58..701bd6a 100644
--- a/glances.subfolder.conf.sample
+++ b/glances.subfolder.conf.sample
@@ -14,7 +14,7 @@ location ^~ /glances/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_glances glances;
+    set $upstream_app glances;
     rewrite /glances(.*) $1 break;
-    proxy_pass http://$upstream_glances:61208;
+    proxy_pass http://$upstream_app:61208;
 }
diff --git a/grafana.subdomain.conf.sample b/grafana.subdomain.conf.sample
index b196357..67af2cf 100644
--- a/grafana.subdomain.conf.sample
+++ b/grafana.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_grafana grafana;
-        proxy_pass http://$upstream_grafana:3000;
+        set $upstream_app grafana;
+        proxy_pass http://$upstream_app:3000;
     }
 }
diff --git a/grocy.subdomain.conf.sample b/grocy.subdomain.conf.sample
index 71d7a46..e4c0705 100644
--- a/grocy.subdomain.conf.sample
+++ b/grocy.subdomain.conf.sample
@@ -24,8 +24,8 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_grocy grocy;
-        proxy_pass http://$upstream_grocy:80;
+        set $upstream_app grocy;
+        proxy_pass http://$upstream_app:80;
     }
 
 }
\ No newline at end of file
diff --git a/guacamole.subdomain.conf.sample b/guacamole.subdomain.conf.sample
index efe4e3f..e74eef1 100644
--- a/guacamole.subdomain.conf.sample
+++ b/guacamole.subdomain.conf.sample
@@ -25,7 +25,7 @@ server {
         include /config/nginx/proxy.conf;
         proxy_buffering off;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_guacamole guacamole;
-        proxy_pass http://$upstream_guacamole:8080;
+        set $upstream_app guacamole;
+        proxy_pass http://$upstream_app:8080;
     }
 }
diff --git a/guacamole.subfolder.conf.sample b/guacamole.subfolder.conf.sample
index ea14873..0ab1978 100644
--- a/guacamole.subfolder.conf.sample
+++ b/guacamole.subfolder.conf.sample
@@ -15,7 +15,7 @@ location ^~ /guacamole/ {
     include /config/nginx/proxy.conf;
     proxy_buffering off;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_guacamole guacamole;
+    set $upstream_app guacamole;
     rewrite /guacamole(.*) $1 break;
-    proxy_pass http://$upstream_guacamole:8080;
+    proxy_pass http://$upstream_app:8080;
 }
diff --git a/headphones.subdomain.conf.sample b/headphones.subdomain.conf.sample
index a440ee0..5e91780 100644
--- a/headphones.subdomain.conf.sample
+++ b/headphones.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_headphones headphones;
-        proxy_pass http://$upstream_headphones:8181;
+        set $upstream_app headphones;
+        proxy_pass http://$upstream_app:8181;
     }
 }
diff --git a/headphones.subfolder.conf.sample b/headphones.subfolder.conf.sample
index 775aa35..70499e0 100644
--- a/headphones.subfolder.conf.sample
+++ b/headphones.subfolder.conf.sample
@@ -11,6 +11,6 @@ location ^~ /headphones {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_headphones headphones;
-    proxy_pass http://$upstream_headphones:8181;
+    set $upstream_app headphones;
+    proxy_pass http://$upstream_app:8181;
 }
diff --git a/heimdall.subdomain.conf.sample b/heimdall.subdomain.conf.sample
index c37f830..3df0abe 100644
--- a/heimdall.subdomain.conf.sample
+++ b/heimdall.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_heimdall heimdall;
-        proxy_pass https://$upstream_heimdall:443;
+        set $upstream_app heimdall;
+        proxy_pass https://$upstream_app:443;
     }
 }
diff --git a/heimdall.subfolder.conf.sample b/heimdall.subfolder.conf.sample
index 37f4bf1..bdd81b3 100644
--- a/heimdall.subfolder.conf.sample
+++ b/heimdall.subfolder.conf.sample
@@ -11,6 +11,6 @@ location / {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_heimdall heimdall;
-    proxy_pass https://$upstream_heimdall:443;
+    set $upstream_app heimdall;
+    proxy_pass https://$upstream_app:443;
 }
diff --git a/homeassistant.subdomain.conf.sample b/homeassistant.subdomain.conf.sample
index 97d6f77..b906d43 100644
--- a/homeassistant.subdomain.conf.sample
+++ b/homeassistant.subdomain.conf.sample
@@ -24,14 +24,14 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_homeassistant homeassistant;
-        proxy_pass http://$upstream_homeassistant:8123;
+        set $upstream_app homeassistant;
+        proxy_pass http://$upstream_app:8123;
     }
 
     location /api/websocket {
         resolver 127.0.0.11 valid=30s;
-        set $upstream_homeassistant homeassistant;
-        proxy_pass http://$upstream_homeassistant:8123;
+        set $upstream_app homeassistant;
+        proxy_pass http://$upstream_app:8123;
         proxy_set_header Host $host;
 
         proxy_http_version 1.1;
diff --git a/jackett.subdomain.conf.sample b/jackett.subdomain.conf.sample
index bd63748..017d06e 100644
--- a/jackett.subdomain.conf.sample
+++ b/jackett.subdomain.conf.sample
@@ -24,14 +24,14 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_jackett jackett;
-        proxy_pass http://$upstream_jackett:9117;
+        set $upstream_app jackett;
+        proxy_pass http://$upstream_app:9117;
     }
 
     location ~ (/jackett)?/(api|dl) {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_jackett jackett;
-        proxy_pass http://$upstream_jackett:9117;
+        set $upstream_app jackett;
+        proxy_pass http://$upstream_app:9117;
     }
 }
diff --git a/jackett.subfolder.conf.sample b/jackett.subfolder.conf.sample
index 42464ca..3ed1b73 100644
--- a/jackett.subfolder.conf.sample
+++ b/jackett.subfolder.conf.sample
@@ -11,13 +11,13 @@ location /jackett {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_jackett jackett;
-    proxy_pass http://$upstream_jackett:9117;
+    set $upstream_app jackett;
+    proxy_pass http://$upstream_app:9117;
 }
 
 location ~ /jackett/(api|dl) {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_jackett jackett;
-    proxy_pass http://$upstream_jackett:9117;
+    set $upstream_app jackett;
+    proxy_pass http://$upstream_app:9117;
 }
diff --git a/jellyfin.subdomain.conf.sample b/jellyfin.subdomain.conf.sample
index 3d37bb1..763da91 100644
--- a/jellyfin.subdomain.conf.sample
+++ b/jellyfin.subdomain.conf.sample
@@ -1,6 +1,6 @@
 # make sure that your dns has a cname set for jellyfin, if jellyfin is running in bridge mode, the below config should work as is, although,
-# the container name is expected to be "jellyfin", if not, replace the lines "set $upstream_jellyfin jellyfin;" with "set $upstream_jellyfin <containername>;"
-# for host mode, replace the lines "proxy_pass http://$upstream_jellyfin:8096;" with "proxy_pass http://HOSTIP:8096;" HOSTIP being the IP address of jellyfin
+# the container name is expected to be "jellyfin", if not, replace the lines "set $upstream_app jellyfin;" 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 jellyfin
 # in jellyfin settings, under "Advanced/Networking" change the public https port to 443, leave the local ports as is,
 # 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_jellyfin jellyfin;
-        proxy_pass http://$upstream_jellyfin:8096;
+        set $upstream_app jellyfin;
+        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 ~ (/jellyfin)?/socket {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_jellyfin jellyfin;
-        proxy_pass http://$upstream_jellyfin:8096;
+        set $upstream_app jellyfin;
+        proxy_pass http://$upstream_app:8096;
 		
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection $http_connection;
diff --git a/jellyfin.subfolder.conf.sample b/jellyfin.subfolder.conf.sample
index 14f41d7..2db8143 100644
--- a/jellyfin.subfolder.conf.sample
+++ b/jellyfin.subfolder.conf.sample
@@ -1,6 +1,6 @@
 # if jellyfin is running in bridge mode, the below config should work as is, although, the container name is expected to be "jellyfin",
-# if not, replace the lines "set $upstream_jellyfin jellyfin;" with "set $upstream_jellyfin <containername>;"
-# for host mode, replace the lines "proxy_pass http://$upstream_jellyfin:8096;" with "proxy_pass http://HOSTIP:8096;" HOSTIP being the IP address of jellyfin
+# if not, replace the lines "set $upstream_app jellyfin;" 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 jellyfin
 # in jellyfin settings, under "Advanced/Networking" change the public https port to 443, leave the local ports as is, set the base url to "/jellyfin",
 # and set the "Secure connection mode" to "Handled by reverse proxy"
 
@@ -10,8 +10,8 @@ location /jellyfin {
 location ^~ /jellyfin/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_jellyfin jellyfin;
-    proxy_pass http://$upstream_jellyfin:8096;
+    set $upstream_app jellyfin;
+    proxy_pass http://$upstream_app:8096;
     
     proxy_set_header Range $http_range;
     proxy_set_header If-Range $http_if_range;
diff --git a/jenkins.subfolder.conf.sample b/jenkins.subfolder.conf.sample
index 3593239..9c33335 100644
--- a/jenkins.subfolder.conf.sample
+++ b/jenkins.subfolder.conf.sample
@@ -24,6 +24,6 @@ location ^~ /jenkins/ {
     proxy_request_buffering off;
     proxy_buffering off;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_jenkins jenkins;    
-    proxy_pass http://$upstream_jenkins:8080;
+    set $upstream_app jenkins;    
+    proxy_pass http://$upstream_app:8080;
 }
\ No newline at end of file
diff --git a/kanzi.subdomain.conf.sample b/kanzi.subdomain.conf.sample
index 11560da..e478467 100644
--- a/kanzi.subdomain.conf.sample
+++ b/kanzi.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_kanzi kanzi;
-        proxy_pass https://$upstream_kanzi:8000;
+        set $upstream_app kanzi;
+        proxy_pass https://$upstream_app:8000;
     }
 }
diff --git a/kanzi.subfolder.conf.sample b/kanzi.subfolder.conf.sample
index 40582b2..2e3b585 100644
--- a/kanzi.subfolder.conf.sample
+++ b/kanzi.subfolder.conf.sample
@@ -14,7 +14,7 @@ location ^~ /kanzi/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_kanzi kanzi;
+    set $upstream_app kanzi;
     rewrite /kanzi(.*) $1 break;
-    proxy_pass https://$upstream_kanzi:8000;
+    proxy_pass https://$upstream_app:8000;
 }
diff --git a/lazylibrarian.subdomain.conf.sample b/lazylibrarian.subdomain.conf.sample
index 1494a45..c9d3a77 100644
--- a/lazylibrarian.subdomain.conf.sample
+++ b/lazylibrarian.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_lazylibrarian lazylibrarian;
-        proxy_pass http://$upstream_lazylibrarian:5299;
+        set $upstream_app lazylibrarian;
+        proxy_pass http://$upstream_app:5299;
     }
 }
diff --git a/lazylibrarian.subfolder.conf.sample b/lazylibrarian.subfolder.conf.sample
index 5a4a8c7..93f26d6 100644
--- a/lazylibrarian.subfolder.conf.sample
+++ b/lazylibrarian.subfolder.conf.sample
@@ -11,6 +11,6 @@ location ^~ /lazylibrarian {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_lazylibrarian lazylibrarian;
-    proxy_pass http://$upstream_lazylibrarian:5299;
+    set $upstream_app lazylibrarian;
+    proxy_pass http://$upstream_app:5299;
 }
diff --git a/librespeed.subdomain.com.sample b/librespeed.subdomain.com.sample
index 65836a6..1fc4388 100644
--- a/librespeed.subdomain.com.sample
+++ b/librespeed.subdomain.com.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_librespeed librespeed;
-        proxy_pass http://$upstream_librespeed;
+        set $upstream_app librespeed;
+        proxy_pass http://$upstream_app;
     }
 }
diff --git a/lidarr.subdomain.conf.sample b/lidarr.subdomain.conf.sample
index b86f6b5..c982d73 100644
--- a/lidarr.subdomain.conf.sample
+++ b/lidarr.subdomain.conf.sample
@@ -24,14 +24,14 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_lidarr lidarr;
-        proxy_pass http://$upstream_lidarr:8686;
+        set $upstream_app lidarr;
+        proxy_pass http://$upstream_app:8686;
     }
 
     location ~ (/lidarr)?/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_lidarr lidarr;
-        proxy_pass http://$upstream_lidarr:8686;
+        set $upstream_app lidarr;
+        proxy_pass http://$upstream_app:8686;
     }
 }
diff --git a/lidarr.subfolder.conf.sample b/lidarr.subfolder.conf.sample
index 2783100..bd2e9bf 100644
--- a/lidarr.subfolder.conf.sample
+++ b/lidarr.subfolder.conf.sample
@@ -11,13 +11,13 @@ location ^~ /lidarr {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_lidarr lidarr;
-    proxy_pass http://$upstream_lidarr:8686;
+    set $upstream_app lidarr;
+    proxy_pass http://$upstream_app:8686;
 }
 
 location ^~ /lidarr/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_lidarr lidarr;
-    proxy_pass http://$upstream_lidarr:8686;
+    set $upstream_app lidarr;
+    proxy_pass http://$upstream_app:8686;
 }
diff --git a/lychee.subdomain.conf.sample b/lychee.subdomain.conf.sample
index 32a0584..1c26191 100644
--- a/lychee.subdomain.conf.sample
+++ b/lychee.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_lychee lychee;
-        proxy_pass http://$upstream_lychee;
+        set $upstream_app lychee;
+        proxy_pass http://$upstream_app;
     }
 }
diff --git a/medusa.subdomain.conf.sample b/medusa.subdomain.conf.sample
index 779e6bb..452d0db 100644
--- a/medusa.subdomain.conf.sample
+++ b/medusa.subdomain.conf.sample
@@ -26,7 +26,7 @@ server {
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
         resolver 127.0.0.11 valid=30s;
-        set $upstream_medusa medusa;
-        proxy_pass http://$upstream_medusa:8081;
+        set $upstream_app medusa;
+        proxy_pass http://$upstream_app:8081;
     }
 }
diff --git a/medusa.subfolder.conf.sample b/medusa.subfolder.conf.sample
index 9167709..9010f6d 100644
--- a/medusa.subfolder.conf.sample
+++ b/medusa.subfolder.conf.sample
@@ -13,6 +13,6 @@ location ^~ /medusa {
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "upgrade";
     resolver 127.0.0.11 valid=30s;
-    set $upstream_medusa medusa;
-    proxy_pass http://$upstream_medusa:8081;
+    set $upstream_app medusa;
+    proxy_pass http://$upstream_app:8081;
 }
diff --git a/monitorr.subdomain.conf.sample b/monitorr.subdomain.conf.sample
index 7710089..fc5d902 100644
--- a/monitorr.subdomain.conf.sample
+++ b/monitorr.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_monitorr monitorr;
-        proxy_pass http://$upstream_monitorr:80;
+        set $upstream_app monitorr;
+        proxy_pass http://$upstream_app:80;
     }
 }
diff --git a/monitorr.subfolder.conf.sample b/monitorr.subfolder.conf.sample
index 90d3d98..69e84bf 100644
--- a/monitorr.subfolder.conf.sample
+++ b/monitorr.subfolder.conf.sample
@@ -14,6 +14,6 @@ location ^~ /monitorr/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_monitorr monitorr;
-    proxy_pass http://$upstream_monitorr:80;
+    set $upstream_app monitorr;
+    proxy_pass http://$upstream_app:80;
 }
diff --git a/mstream.subdomain.conf.sample b/mstream.subdomain.conf.sample
index 56042de..c6aa2e7 100644
--- a/mstream.subdomain.conf.sample
+++ b/mstream.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
         
 	include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_mstream mstream;
-        proxy_pass http://$upstream_mstream:3000;
+        set $upstream_app mstream;
+        proxy_pass http://$upstream_app:3000;
     }
 }
diff --git a/mylar.subdomain.conf.sample b/mylar.subdomain.conf.sample
index 29916a2..9d001be 100644
--- a/mylar.subdomain.conf.sample
+++ b/mylar.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_mylar mylar;
-        proxy_pass http://$upstream_mylar:8090;
+        set $upstream_app mylar;
+        proxy_pass http://$upstream_app:8090;
     }
 }
diff --git a/mylar.subfolder.conf.sample b/mylar.subfolder.conf.sample
index 72d0e70..b35fb44 100644
--- a/mylar.subfolder.conf.sample
+++ b/mylar.subfolder.conf.sample
@@ -11,6 +11,6 @@ location ^~ /mylar {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_mylar mylar;
-    proxy_pass http://$upstream_mylar:8090;
+    set $upstream_app mylar;
+    proxy_pass http://$upstream_app:8090;
 }
diff --git a/mytinytodo.subfolder.conf.sample b/mytinytodo.subfolder.conf.sample
index 9ad2a44..39c65de 100644
--- a/mytinytodo.subfolder.conf.sample
+++ b/mytinytodo.subfolder.conf.sample
@@ -16,6 +16,6 @@ location ^~ /todo/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_mytinytodo mytinytodo;
-    proxy_pass http://$upstream_mytinytodo:80/;
+    set $upstream_app mytinytodo;
+    proxy_pass http://$upstream_app:80/;
 }
diff --git a/netdata.subdomain.conf.sample b/netdata.subdomain.conf.sample
index a402dd6..7577191 100644
--- a/netdata.subdomain.conf.sample
+++ b/netdata.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_netdata netdata;
-        proxy_pass http://$upstream_netdata:19999;
+        set $upstream_app netdata;
+        proxy_pass http://$upstream_app:19999;
     }
 }
diff --git a/netdata.subfolder.conf.sample b/netdata.subfolder.conf.sample
index 59c3837..efc52ca 100644
--- a/netdata.subfolder.conf.sample
+++ b/netdata.subfolder.conf.sample
@@ -14,7 +14,7 @@ location ^~ /netdata/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_netdata netdata;
+    set $upstream_app netdata;
     rewrite /netdata(.*) $1 break;
-    proxy_pass http://$upstream_netdata:19999;
+    proxy_pass http://$upstream_app:19999;
 }
diff --git a/nextcloud.subdomain.conf.sample b/nextcloud.subdomain.conf.sample
index 6ff353d..1acf745 100644
--- a/nextcloud.subdomain.conf.sample
+++ b/nextcloud.subdomain.conf.sample
@@ -25,8 +25,8 @@ server {
     location / {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_nextcloud nextcloud;
+        set $upstream_app nextcloud;
         proxy_max_temp_file_size 2048m;
-        proxy_pass https://$upstream_nextcloud:443;
+        proxy_pass https://$upstream_app:443;
     }
 }
diff --git a/nextcloud.subfolder.conf.sample b/nextcloud.subfolder.conf.sample
index 3d42ef2..d16853d 100644
--- a/nextcloud.subfolder.conf.sample
+++ b/nextcloud.subfolder.conf.sample
@@ -26,9 +26,9 @@ location /nextcloud {
 location ^~ /nextcloud/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_nextcloud nextcloud;
+    set $upstream_app nextcloud;
     rewrite /nextcloud(.*) $1 break;
-    proxy_pass https://$upstream_nextcloud:443;
+    proxy_pass https://$upstream_app:443;
     
     proxy_max_temp_file_size 2048m;
 
diff --git a/nzbget.subdomain.conf.sample b/nzbget.subdomain.conf.sample
index a3f4872..cd3de0c 100644
--- a/nzbget.subdomain.conf.sample
+++ b/nzbget.subdomain.conf.sample
@@ -24,28 +24,28 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_nzbget nzbget;
-        proxy_pass http://$upstream_nzbget:6789;
+        set $upstream_app nzbget;
+        proxy_pass http://$upstream_app:6789;
     }
 
     location ~ (/nzbget)?(/[^\/:]*:[^\/:]*)?/jsonrpc {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_nzbget nzbget;
-        proxy_pass http://$upstream_nzbget:6789;
+        set $upstream_app nzbget;
+        proxy_pass http://$upstream_app:6789;
     }
 
     location ~ (/nzbget)?(/[^\/:]*:[^\/]*)?/jsonprpc {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_nzbget nzbget;
-        proxy_pass http://$upstream_nzbget:6789;
+        set $upstream_app nzbget;
+        proxy_pass http://$upstream_app:6789;
     }
 
     location ~ (/nzbget)?(/[^\/:]*:[^\/]*)?/xmlrpc {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_nzbget nzbget;
-        proxy_pass http://$upstream_nzbget:6789;
+        set $upstream_app nzbget;
+        proxy_pass http://$upstream_app:6789;
     }
 }
diff --git a/nzbget.subfolder.conf.sample b/nzbget.subfolder.conf.sample
index fd17df6..c700f58 100644
--- a/nzbget.subfolder.conf.sample
+++ b/nzbget.subfolder.conf.sample
@@ -11,27 +11,27 @@ location /nzbget {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_nzbget nzbget;
-    proxy_pass http://$upstream_nzbget:6789;
+    set $upstream_app nzbget;
+    proxy_pass http://$upstream_app:6789;
 }
 
 location ~ /nzbget(/[^\/:]*:[^\/]*)?/jsonrpc {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_nzbget nzbget;
-    proxy_pass http://$upstream_nzbget:6789;
+    set $upstream_app nzbget;
+    proxy_pass http://$upstream_app:6789;
 }
 
 location ~ /nzbget(/[^\/:]*:[^\/]*)?/jsonprpc {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_nzbget nzbget;
-    proxy_pass http://$upstream_nzbget:6789;
+    set $upstream_app nzbget;
+    proxy_pass http://$upstream_app:6789;
 }
 
 location ~ /nzbget(/[^\/:]*:[^\/]*)?/xmlrpc {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_nzbget nzbget;
-    proxy_pass http://$upstream_nzbget:6789;
+    set $upstream_app nzbget;
+    proxy_pass http://$upstream_app:6789;
 }
diff --git a/nzbhydra.subdomain.conf.sample b/nzbhydra.subdomain.conf.sample
index cbca73a..536558e 100644
--- a/nzbhydra.subdomain.conf.sample
+++ b/nzbhydra.subdomain.conf.sample
@@ -24,43 +24,43 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_nzbhydra hydra2;
-        proxy_pass http://$upstream_nzbhydra:5076;
+        set $upstream_app hydra2;
+        proxy_pass http://$upstream_app:5076;
     }
 
     location ~ (/nzbhydra)?/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_nzbhydra hydra2;
-        proxy_pass http://$upstream_nzbhydra:5076;
+        set $upstream_app hydra2;
+        proxy_pass http://$upstream_app:5076;
     }
 
     location ~ (/nzbhydra)?/getnzb {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_nzbhydra hydra2;
-        proxy_pass http://$upstream_nzbhydra:5076;
+        set $upstream_app hydra2;
+        proxy_pass http://$upstream_app:5076;
     }
 
     location ~ (/nzbhydra)?/gettorrent {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_nzbhydra hydra2;
-        proxy_pass http://$upstream_nzbhydra:5076;
+        set $upstream_app hydra2;
+        proxy_pass http://$upstream_app:5076;
     }
 
     location ~ (/nzbhydra)?/rss {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_nzbhydra hydra2;
-        proxy_pass http://$upstream_nzbhydra:5076;
+        set $upstream_app hydra2;
+        proxy_pass http://$upstream_app:5076;
     }
 
     location ~ (/nzbhydra)?/torznab/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_nzbhydra hydra2;
-        proxy_pass http://$upstream_nzbhydra:5076;
+        set $upstream_app hydra2;
+        proxy_pass http://$upstream_app:5076;
     }
 
 }
diff --git a/nzbhydra.subfolder.conf.sample b/nzbhydra.subfolder.conf.sample
index cc36302..dc3abed 100644
--- a/nzbhydra.subfolder.conf.sample
+++ b/nzbhydra.subfolder.conf.sample
@@ -11,41 +11,41 @@ location ^~ /nzbhydra {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_nzbhydra hydra2;
-    proxy_pass http://$upstream_nzbhydra:5076;
+    set $upstream_app hydra2;
+    proxy_pass http://$upstream_app:5076;
 }
 
 location ^~ /nzbhydra/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_nzbhydra hydra2;
-    proxy_pass http://$upstream_nzbhydra:5076;
+    set $upstream_app hydra2;
+    proxy_pass http://$upstream_app:5076;
 }
 
 location ^~ /nzbhydra/getnzb {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_nzbhydra hydra2;
-    proxy_pass http://$upstream_nzbhydra:5076;
+    set $upstream_app hydra2;
+    proxy_pass http://$upstream_app:5076;
 }
 
 location ^~ /nzbhydra/gettorrent {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_nzbhydra hydra2;
-    proxy_pass http://$upstream_nzbhydra:5076;
+    set $upstream_app hydra2;
+    proxy_pass http://$upstream_app:5076;
 }
 
 location ^~ /nzbhydra/rss {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_nzbhydra hydra2;
-    proxy_pass http://$upstream_nzbhydra:5076;
+    set $upstream_app hydra2;
+    proxy_pass http://$upstream_app:5076;
 }
 
 location ^~ /nzbhydra/torznab/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_nzbhydra hydra2;
-    proxy_pass http://$upstream_nzbhydra:5076;
+    set $upstream_app hydra2;
+    proxy_pass http://$upstream_app:5076;
 }
diff --git a/ombi.subdomain.conf.sample b/ombi.subdomain.conf.sample
index 347af40..e6b71e1 100644
--- a/ombi.subdomain.conf.sample
+++ b/ombi.subdomain.conf.sample
@@ -24,24 +24,24 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_ombi ombi;
-        proxy_pass http://$upstream_ombi:3579;
+        set $upstream_app ombi;
+        proxy_pass http://$upstream_app:3579;
     }
 
     # This allows access to the actual api
     location ~ (/ombi)?/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_ombi ombi;
-        proxy_pass http://$upstream_ombi:3579;
+        set $upstream_app ombi;
+        proxy_pass http://$upstream_app:3579;
    }
 
     # This allows access to the documentation for the api
     location ~ (/ombi)?/swagger {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_ombi ombi;
-        proxy_pass http://$upstream_ombi:3579;
+        set $upstream_app ombi;
+        proxy_pass http://$upstream_app:3579;
    }
    if ($http_referer ~* /ombi) {
        rewrite ^/swagger/(.*) /ombi/swagger/$1? redirect;
diff --git a/ombi.subfolder.conf.sample b/ombi.subfolder.conf.sample
index 7fb8557..4c02314 100644
--- a/ombi.subfolder.conf.sample
+++ b/ombi.subfolder.conf.sample
@@ -15,16 +15,16 @@ location ^~ /ombi/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_ombi ombi;
-    proxy_pass http://$upstream_ombi:3579;
+    set $upstream_app ombi;
+    proxy_pass http://$upstream_app:3579;
 }
 
 # This allows access to the actual api
 location ^~ /ombi/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_ombi ombi;
-    proxy_pass http://$upstream_ombi:3579;
+    set $upstream_app ombi;
+    proxy_pass http://$upstream_app:3579;
 }
 if ($http_referer ~* /ombi) {
     rewrite ^/api/(.*) /ombi/api/$1? redirect;
@@ -34,8 +34,8 @@ if ($http_referer ~* /ombi) {
 location ^~ /ombi/swagger {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_ombi ombi;
-    proxy_pass http://$upstream_ombi:3579;
+    set $upstream_app ombi;
+    proxy_pass http://$upstream_app:3579;
 }
 if ($http_referer ~* /ombi) {
     rewrite ^/swagger/(.*) /ombi/swagger/$1? redirect;
diff --git a/openvpn-as.subdomain.conf.sample b/openvpn-as.subdomain.conf.sample
index 524cb12..5be1215 100644
--- a/openvpn-as.subdomain.conf.sample
+++ b/openvpn-as.subdomain.conf.sample
@@ -24,8 +24,8 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_ovpn openvpn-as;
-        proxy_pass https://$upstream_ovpn:943;
+        set $upstream_app openvpn-as;
+        proxy_pass https://$upstream_app:943;
 
     }
 
@@ -40,7 +40,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_ovpn openvpn-as;
-        proxy_pass https://$upstream_ovpn:943;
+        set $upstream_app openvpn-as;
+        proxy_pass https://$upstream_app:943;
     }
 }
diff --git a/organizr-auth.subfolder.conf.sample b/organizr-auth.subfolder.conf.sample
index 849b264..3bb22da 100644
--- a/organizr-auth.subfolder.conf.sample
+++ b/organizr-auth.subfolder.conf.sample
@@ -17,8 +17,8 @@ location ~ /auth-([0-9]+) {
     internal;
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_organizr organizr;
-    proxy_pass http://$upstream_organizr:80/api/?v1/auth&group=$1;
+    set $upstream_app organizr;
+    proxy_pass http://$upstream_app:80/api/?v1/auth&group=$1;
     proxy_set_header Content-Length "";
 
     # Do not uncomment the lines below, these are examples for usue in other proxy configs
diff --git a/organizr.subdomain.conf.sample b/organizr.subdomain.conf.sample
index 496af32..78b95a5 100644
--- a/organizr.subdomain.conf.sample
+++ b/organizr.subdomain.conf.sample
@@ -24,8 +24,8 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_organizr organizr;
-        proxy_pass http://$upstream_organizr:80;
+        set $upstream_app organizr;
+        proxy_pass http://$upstream_app:80;
     }
 
     # Optional redirect server errors to organizr error pages
diff --git a/organizr.subfolder.conf.sample b/organizr.subfolder.conf.sample
index 4cad9f2..11df71c 100644
--- a/organizr.subfolder.conf.sample
+++ b/organizr.subfolder.conf.sample
@@ -11,8 +11,8 @@ location / {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_organizr organizr;
-    proxy_pass http://$upstream_organizr:80;
+    set $upstream_app organizr;
+    proxy_pass http://$upstream_app:80;
 }
 
 # Optional redirect server errors to organizr error pages
diff --git a/osticket.subdomain.conf.sample b/osticket.subdomain.conf.sample
index a74de40..e2ef2d5 100644
--- a/osticket.subdomain.conf.sample
+++ b/osticket.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_osticket osticket;
-        proxy_pass http://$upstream_osticket:80;
+        set $upstream_app osticket;
+        proxy_pass http://$upstream_app:80;
     }
 }
diff --git a/phpmyadmin.subdomain.conf.sample b/phpmyadmin.subdomain.conf.sample
index 97fa1f6..623f29f 100644
--- a/phpmyadmin.subdomain.conf.sample
+++ b/phpmyadmin.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_phpmyadmin phpmyadmin;
-        proxy_pass http://$upstream_phpmyadmin:80;
+        set $upstream_app phpmyadmin;
+        proxy_pass http://$upstream_app:80;
     }
 }
diff --git a/phpmyadmin.subfolder.conf.sample b/phpmyadmin.subfolder.conf.sample
index 22e2b43..727f35c 100644
--- a/phpmyadmin.subfolder.conf.sample
+++ b/phpmyadmin.subfolder.conf.sample
@@ -14,7 +14,7 @@ location ^~ /phpmyadmin/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_phpmyadmin phpmyadmin;
+    set $upstream_app phpmyadmin;
     rewrite /phpmyadmin(.*) $1 break;
-    proxy_pass http://$upstream_phpmyadmin:80;
+    proxy_pass http://$upstream_app:80;
 }
diff --git a/pihole.subdomain.conf.sample b/pihole.subdomain.conf.sample
index 084edc5..5b0ecd6 100644
--- a/pihole.subdomain.conf.sample
+++ b/pihole.subdomain.conf.sample
@@ -24,8 +24,8 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_pihole pihole;
-        proxy_pass http://$upstream_pihole:80;
+        set $upstream_app pihole;
+        proxy_pass http://$upstream_app:80;
         proxy_hide_header X-Frame-Options;
     }
 
@@ -40,8 +40,8 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_pihole pihole;
-        proxy_pass http://$upstream_pihole:80;
+        set $upstream_app pihole;
+        proxy_pass http://$upstream_app:80;
         proxy_hide_header X-Frame-Options;
     }
 }
diff --git a/pihole.subfolder.conf.sample b/pihole.subfolder.conf.sample
index 88b7ecb..b1b399a 100644
--- a/pihole.subfolder.conf.sample
+++ b/pihole.subfolder.conf.sample
@@ -14,9 +14,9 @@ location ^~ /pihole/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_pihole pihole;
+    set $upstream_app pihole;
     rewrite /pihole(.*) $1 break;
-    proxy_pass http://$upstream_pihole:80;
+    proxy_pass http://$upstream_app:80;
     proxy_hide_header X-Frame-Options;
 }
 
@@ -34,8 +34,8 @@ location ^~ /pihole/admin/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_pihole pihole;
+    set $upstream_app pihole;
     rewrite /pihole(.*) $1 break;
-    proxy_pass http://$upstream_pihole:80;
+    proxy_pass http://$upstream_app:80;
     proxy_hide_header X-Frame-Options;
 }
diff --git a/piwigo.subdomain.conf.sample b/piwigo.subdomain.conf.sample
index b7e4a00..71585c2 100644
--- a/piwigo.subdomain.conf.sample
+++ b/piwigo.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_piwigo piwigo;
-        proxy_pass http://$upstream_piwigo;
+        set $upstream_app piwigo;
+        proxy_pass http://$upstream_app;
     }
 }
diff --git a/plex.subdomain.conf.sample b/plex.subdomain.conf.sample
index 154cd5c..89330bf 100644
--- a/plex.subdomain.conf.sample
+++ b/plex.subdomain.conf.sample
@@ -1,5 +1,5 @@
 # make sure that your dns has a cname set for plex, if plex is running in bridge mode, the below config should work as is, for host mode,
-# replace the line "proxy_pass http://$upstream_plex:32400;" with "proxy_pass http://HOSTIP:32400;" HOSTIP being the IP address of plex
+# replace the line "proxy_pass http://$upstream_app:32400;" with "proxy_pass http://HOSTIP:32400;" HOSTIP being the IP address of plex
 # in plex server settings, under network, fill in "Custom server access URLs" with your domain (ie. "https://plex.yourdomain.url:443")
 
 server {
@@ -29,8 +29,8 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_plex plex;
-        proxy_pass http://$upstream_plex:32400;
+        set $upstream_app plex;
+        proxy_pass http://$upstream_app:32400;
 
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
diff --git a/plex.subfolder.conf.sample b/plex.subfolder.conf.sample
index ac35467..7fbafc7 100644
--- a/plex.subfolder.conf.sample
+++ b/plex.subfolder.conf.sample
@@ -3,7 +3,7 @@
 
 # plex does not require a base url setting
 # if plex is running in bridge mode, the below config should work as is.
-# for host mode, replace the line "proxy_pass http://$upstream_plex:32400;" with "proxy_pass http://HOSTIP:32400;" HOSTIP being the IP address of plex
+# for host mode, replace the line "proxy_pass http://$upstream_app:32400;" with "proxy_pass http://HOSTIP:32400;" HOSTIP being the IP address of plex
 # in plex server settings, under network, fill in "Custom server access URLs" with your domain (ie. "https://yourdomain.url:443/plex")
 
 location /plex {
@@ -20,9 +20,9 @@ location ^~ /plex/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_plex plex;
+    set $upstream_app plex;
     rewrite /plex(.*) $1 break;
-    proxy_pass http://$upstream_plex:32400;
+    proxy_pass http://$upstream_app:32400;
 
     proxy_set_header X-Plex-Client-Identifier $http_x_plex_client_identifier;
     proxy_set_header X-Plex-Device $http_x_plex_device;
diff --git a/plexwebtools.subdomain.conf.sample b/plexwebtools.subdomain.conf.sample
index 3d9754e..c740c46 100644
--- a/plexwebtools.subdomain.conf.sample
+++ b/plexwebtools.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_plex plex;
-        proxy_pass http://$upstream_plex:33400;
+        set $upstream_app plex;
+        proxy_pass http://$upstream_app:33400;
     }
 }
diff --git a/plexwebtools.subfolder.conf.sample b/plexwebtools.subfolder.conf.sample
index 87ecfc8..08da7c3 100644
--- a/plexwebtools.subfolder.conf.sample
+++ b/plexwebtools.subfolder.conf.sample
@@ -14,6 +14,6 @@ location ^~ /plexwebtools/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_plex plex;
-    proxy_pass http://$upstream_plex:33400;
+    set $upstream_app plex;
+    proxy_pass http://$upstream_app:33400;
 }
diff --git a/portainer.subdomain.conf.sample b/portainer.subdomain.conf.sample
index d4d4588..93d354c 100644
--- a/portainer.subdomain.conf.sample
+++ b/portainer.subdomain.conf.sample
@@ -23,8 +23,8 @@ server {
         #error_page 401 =200 /login;
 
         resolver 127.0.0.11 valid=30s;
-        set $upstream_portainer portainer;
-        proxy_pass http://$upstream_portainer:9000;
+        set $upstream_app portainer;
+        proxy_pass http://$upstream_app:9000;
         proxy_set_header Connection "";
         proxy_http_version 1.1;
         proxy_hide_header X-Frame-Options; # Possibly nott needed after Portainer 1.20.0
@@ -40,8 +40,8 @@ server {
         #error_page 401 =200 /login;
 
         resolver 127.0.0.11 valid=30s;
-        set $upstream_portainer portainer;
-        proxy_pass http://$upstream_portainer:9000;
+        set $upstream_app portainer;
+        proxy_pass http://$upstream_app:9000;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
         proxy_http_version 1.1;
diff --git a/portainer.subfolder.conf.sample b/portainer.subfolder.conf.sample
index 39ca4d6..bbfbd81 100644
--- a/portainer.subfolder.conf.sample
+++ b/portainer.subfolder.conf.sample
@@ -14,18 +14,18 @@ location ^~ /portainer/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_portainer portainer;
+    set $upstream_app portainer;
     rewrite /portainer(.*) $1 break;
-    proxy_pass http://$upstream_portainer:9000;
+    proxy_pass http://$upstream_app:9000;
     proxy_hide_header X-Frame-Options; # Possibly nott needed after Portainer 1.20.0
 }
 
 location ^~ /portainer/api/websocket/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_portainer portainer;
+    set $upstream_app portainer;
     rewrite /portainer(.*) $1 break;
-    proxy_pass http://$upstream_portainer:9000;
+    proxy_pass http://$upstream_app:9000;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "upgrade";
     proxy_hide_header X-Frame-Options; # Possibly nott needed after Portainer 1.20.0
diff --git a/prometheus.subdomain.conf.sample b/prometheus.subdomain.conf.sample
index 77d082a..8f856a9 100644
--- a/prometheus.subdomain.conf.sample
+++ b/prometheus.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_prometheus prometheus;
-        proxy_pass http://$upstream_prometheus:9090;
+        set $upstream_app prometheus;
+        proxy_pass http://$upstream_app:9090;
     }
 }
diff --git a/pydio.subdomain.conf.sample b/pydio.subdomain.conf.sample
index 846127d..c780ba3 100644
--- a/pydio.subdomain.conf.sample
+++ b/pydio.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_pydio pydio;
-        proxy_pass https://$upstream_pydio:443;
+        set $upstream_app pydio;
+        proxy_pass https://$upstream_app:443;
     }
 }
diff --git a/pyload.subdomain.conf.sample b/pyload.subdomain.conf.sample
index 6ca0f84..3fdfc4a 100644
--- a/pyload.subdomain.conf.sample
+++ b/pyload.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_pyload pyload;
-        proxy_pass http://$upstream_pyload:8000;
+        set $upstream_app pyload;
+        proxy_pass http://$upstream_app:8000;
     }
 }
diff --git a/qbittorrent.subdomain.conf.sample b/qbittorrent.subdomain.conf.sample
index f003f37..cad5eaa 100644
--- a/qbittorrent.subdomain.conf.sample
+++ b/qbittorrent.subdomain.conf.sample
@@ -24,65 +24,65 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_qbittorrent qbittorrent;
-        proxy_pass http://$upstream_qbittorrent:8080;
+        set $upstream_app qbittorrent;
+        proxy_pass http://$upstream_app:8080;
 
         proxy_set_header Referer '';
-        proxy_set_header Host $upstream_qbittorrent:8080;
+        proxy_set_header Host $upstream_app:8080;
     }
 
     location ^~ /qbittorrent/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_qbittorrent qbittorrent;
+        set $upstream_app qbittorrent;
         rewrite /qbittorrent(.*) $1 break;
-        proxy_pass http://$upstream_qbittorrent:8080;
+        proxy_pass http://$upstream_app:8080;
 
         proxy_set_header Referer '';
-        proxy_set_header Host $upstream_qbittorrent:8080;
+        proxy_set_header Host $upstream_app:8080;
     }
 
     location ^~ /qbittorrent/command {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_qbittorrent qbittorrent;
+        set $upstream_app qbittorrent;
         rewrite /qbittorrent(.*) $1 break;
-        proxy_pass http://$upstream_qbittorrent:8080;
+        proxy_pass http://$upstream_app:8080;
 
         proxy_set_header Referer '';
-        proxy_set_header Host $upstream_qbittorrent:8080;
+        proxy_set_header Host $upstream_app:8080;
     }
 
     location ^~ /qbittorrent/query {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_qbittorrent qbittorrent;
+        set $upstream_app qbittorrent;
         rewrite /qbittorrent(.*) $1 break;
-        proxy_pass http://$upstream_qbittorrent:8080;
+        proxy_pass http://$upstream_app:8080;
 
         proxy_set_header Referer '';
-        proxy_set_header Host $upstream_qbittorrent:8080;
+        proxy_set_header Host $upstream_app:8080;
     }
 
     location ^~ /qbittorrent/login {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_qbittorrent qbittorrent;
+        set $upstream_app qbittorrent;
         rewrite /qbittorrent(.*) $1 break;
-        proxy_pass http://$upstream_qbittorrent:8080;
+        proxy_pass http://$upstream_app:8080;
 
         proxy_set_header Referer '';
-        proxy_set_header Host $upstream_qbittorrent:8080;
+        proxy_set_header Host $upstream_app:8080;
     }
 
     location ^~ /qbittorrent/sync {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_qbittorrent qbittorrent;
+        set $upstream_app qbittorrent;
         rewrite /qbittorrent(.*) $1 break;
-        proxy_pass http://$upstream_qbittorrent:8080;
+        proxy_pass http://$upstream_app:8080;
 
         proxy_set_header Referer '';
-        proxy_set_header Host $upstream_qbittorrent:8080;
+        proxy_set_header Host $upstream_app:8080;
     }
 }
diff --git a/qbittorrent.subfolder.conf.sample b/qbittorrent.subfolder.conf.sample
index 3799d6b..1c97b02 100644
--- a/qbittorrent.subfolder.conf.sample
+++ b/qbittorrent.subfolder.conf.sample
@@ -14,65 +14,65 @@ location ^~ /qbittorrent/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_qbittorrent qbittorrent;
+    set $upstream_app qbittorrent;
     rewrite /qbittorrent(.*) $1 break;
-    proxy_pass http://$upstream_qbittorrent:8080;
+    proxy_pass http://$upstream_app:8080;
 
     proxy_set_header Referer '';
-    proxy_set_header Host $upstream_qbittorrent:8080;
+    proxy_set_header Host $upstream_app:8080;
 }
 
 location ^~ /qbittorrent/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_qbittorrent qbittorrent;
+    set $upstream_app qbittorrent;
     rewrite /qbittorrent(.*) $1 break;
-    proxy_pass http://$upstream_qbittorrent:8080;
+    proxy_pass http://$upstream_app:8080;
 
     proxy_set_header Referer '';
-    proxy_set_header Host $upstream_qbittorrent:8080;
+    proxy_set_header Host $upstream_app:8080;
 }
 
 location ^~ /qbittorrent/command {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_qbittorrent qbittorrent;
+    set $upstream_app qbittorrent;
     rewrite /qbittorrent(.*) $1 break;
-    proxy_pass http://$upstream_qbittorrent:8080;
+    proxy_pass http://$upstream_app:8080;
 
     proxy_set_header Referer '';
-    proxy_set_header Host $upstream_qbittorrent:8080;
+    proxy_set_header Host $upstream_app:8080;
 }
 
 location ^~ /qbittorrent/query {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_qbittorrent qbittorrent;
+    set $upstream_app qbittorrent;
     rewrite /qbittorrent(.*) $1 break;
-    proxy_pass http://$upstream_qbittorrent:8080;
+    proxy_pass http://$upstream_app:8080;
 
     proxy_set_header Referer '';
-    proxy_set_header Host $upstream_qbittorrent:8080;
+    proxy_set_header Host $upstream_app:8080;
 }
 
 location ^~ /qbittorrent/login {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_qbittorrent qbittorrent;
+    set $upstream_app qbittorrent;
     rewrite /qbittorrent(.*) $1 break;
-    proxy_pass http://$upstream_qbittorrent:8080;
+    proxy_pass http://$upstream_app:8080;
 
     proxy_set_header Referer '';
-    proxy_set_header Host $upstream_qbittorrent:8080;
+    proxy_set_header Host $upstream_app:8080;
 }
 
 location ^~ /qbittorrent/sync {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_qbittorrent qbittorrent;
+    set $upstream_app qbittorrent;
     rewrite /qbittorrent(.*) $1 break;
-    proxy_pass http://$upstream_qbittorrent:8080;
+    proxy_pass http://$upstream_app:8080;
 
     proxy_set_header Referer '';
-    proxy_set_header Host $upstream_qbittorrent:8080;
+    proxy_set_header Host $upstream_app:8080;
 }
diff --git a/quassel-web.subdomain.conf.sample b/quassel-web.subdomain.conf.sample
index 3de6220..ff71b07 100644
--- a/quassel-web.subdomain.conf.sample
+++ b/quassel-web.subdomain.conf.sample
@@ -25,7 +25,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_quassel_web quassel-web;
-        proxy_pass http://$upstream_quassel_web:64080;
+        set $upstream_app quassel-web;
+        proxy_pass http://$upstream_app:64080;
     }
 }
diff --git a/quassel-web.subfolder.conf.sample b/quassel-web.subfolder.conf.sample
index 1e0b74b..95bc32f 100644
--- a/quassel-web.subfolder.conf.sample
+++ b/quassel-web.subfolder.conf.sample
@@ -12,6 +12,6 @@ location ^~ /quassel {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_quassel_web quassel-web;
-    proxy_pass http://$upstream_quassel_web:64080;
+    set $upstream_app quassel-web;
+    proxy_pass http://$upstream_app:64080;
 }
diff --git a/radarr.subdomain.conf.sample b/radarr.subdomain.conf.sample
index 6220e09..9d65e76 100644
--- a/radarr.subdomain.conf.sample
+++ b/radarr.subdomain.conf.sample
@@ -24,14 +24,14 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_radarr radarr;
-        proxy_pass http://$upstream_radarr:7878;
+        set $upstream_app radarr;
+        proxy_pass http://$upstream_app:7878;
     }
 
     location ~ (/radarr)?/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_radarr radarr;
-        proxy_pass http://$upstream_radarr:7878;
+        set $upstream_app radarr;
+        proxy_pass http://$upstream_app:7878;
     }
 }
diff --git a/radarr.subfolder.conf.sample b/radarr.subfolder.conf.sample
index 54ac456..bd9073a 100644
--- a/radarr.subfolder.conf.sample
+++ b/radarr.subfolder.conf.sample
@@ -11,13 +11,13 @@ location ^~ /radarr {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_radarr radarr;
-    proxy_pass http://$upstream_radarr:7878;
+    set $upstream_app radarr;
+    proxy_pass http://$upstream_app:7878;
 }
 
 location ^~ /radarr/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_radarr radarr;
-    proxy_pass http://$upstream_radarr:7878;
+    set $upstream_app radarr;
+    proxy_pass http://$upstream_app:7878;
 }
diff --git a/raneto.subdomain.conf.sample b/raneto.subdomain.conf.sample
index ff03404..0bf8a7c 100644
--- a/raneto.subdomain.conf.sample
+++ b/raneto.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_raneto raneto;
-        proxy_pass http://$upstream_raneto:3000;
+        set $upstream_app raneto;
+        proxy_pass http://$upstream_app:3000;
     }
 }
\ No newline at end of file
diff --git a/resilio-sync.subdomain.conf.sample b/resilio-sync.subdomain.conf.sample
index 9b4d4eb..89f7a1e 100644
--- a/resilio-sync.subdomain.conf.sample
+++ b/resilio-sync.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_resiliosync resilio-sync;
-        proxy_pass http://$upstream_resiliosync:8888;
+        set $upstream_app resilio-sync;
+        proxy_pass http://$upstream_app:8888;
     }
 }
diff --git a/rutorrent.subdomain.conf.sample b/rutorrent.subdomain.conf.sample
index 78f5446..93caeb5 100644
--- a/rutorrent.subdomain.conf.sample
+++ b/rutorrent.subdomain.conf.sample
@@ -24,14 +24,14 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_rutorrent rutorrent;
-        proxy_pass http://$upstream_rutorrent:80;
+        set $upstream_app rutorrent;
+        proxy_pass http://$upstream_app:80;
     }
 
     location /RPC2 {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_rutorrent rutorrent;
-        proxy_pass http://$upstream_rutorrent:80;
+        set $upstream_app rutorrent;
+        proxy_pass http://$upstream_app:80;
     }
 }
diff --git a/rutorrent.subfolder.conf.sample b/rutorrent.subfolder.conf.sample
index ced0600..7ba3901 100644
--- a/rutorrent.subfolder.conf.sample
+++ b/rutorrent.subfolder.conf.sample
@@ -14,15 +14,15 @@ location ^~ /rutorrent/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_rutorrent rutorrent;
+    set $upstream_app rutorrent;
     rewrite /rutorrent(.*) $1 break;
-    proxy_pass http://$upstream_rutorrent:80;
+    proxy_pass http://$upstream_app:80;
 }
 
 location ^~ /rutorrent/RPC2 {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_rutorrent rutorrent;
+    set $upstream_app rutorrent;
     rewrite /rutorrent(.*) $1 break;
-    proxy_pass http://$upstream_rutorrent:80;
+    proxy_pass http://$upstream_app:80;
 }
diff --git a/sabnzbd.subdomain.conf.sample b/sabnzbd.subdomain.conf.sample
index 1de40cc..38b7fd5 100644
--- a/sabnzbd.subdomain.conf.sample
+++ b/sabnzbd.subdomain.conf.sample
@@ -26,14 +26,14 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_sabnzbd sabnzbd;
-        proxy_pass http://$upstream_sabnzbd:8080;
+        set $upstream_app sabnzbd;
+        proxy_pass http://$upstream_app:8080;
     }
 
     location ~ (/sabnzbd)?/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_sabnzbd sabnzbd;
-        proxy_pass http://$upstream_sabnzbd:8080;
+        set $upstream_app sabnzbd;
+        proxy_pass http://$upstream_app:8080;
     }
 }
diff --git a/sabnzbd.subfolder.conf.sample b/sabnzbd.subfolder.conf.sample
index 8648d12..14cb9a8 100644
--- a/sabnzbd.subfolder.conf.sample
+++ b/sabnzbd.subfolder.conf.sample
@@ -11,13 +11,13 @@ location ^~ /sabnzbd {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_sabnzbd sabnzbd;
-    proxy_pass http://$upstream_sabnzbd:8080;
+    set $upstream_app sabnzbd;
+    proxy_pass http://$upstream_app:8080;
 }
 
 location ^~ /sabnzbd/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_sabnzbd sabnzbd;
-    proxy_pass http://$upstream_sabnzbd:8080;
+    set $upstream_app sabnzbd;
+    proxy_pass http://$upstream_app:8080;
 }
diff --git a/scope.subfolder.conf.sample b/scope.subfolder.conf.sample
index 193c35a..24fe4e6 100644
--- a/scope.subfolder.conf.sample
+++ b/scope.subfolder.conf.sample
@@ -14,9 +14,9 @@ location ^~ /scope/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_scope scope;
+    set $upstream_app scope;
     rewrite /scope(.*) $1 break;
-    proxy_pass http://$upstream_scope:4040;
+    proxy_pass http://$upstream_app:4040;
     proxy_set_header Upgrade $http_upgrade;
 	proxy_set_header Connection "upgrade";
 }
\ No newline at end of file
diff --git a/sickrage.subdomain.conf.sample b/sickrage.subdomain.conf.sample
index c9e0803..d468ad7 100644
--- a/sickrage.subdomain.conf.sample
+++ b/sickrage.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_sickrage sickrage;
-        proxy_pass http://$upstream_sickrage:8081;
+        set $upstream_app sickrage;
+        proxy_pass http://$upstream_app:8081;
     }
 }
diff --git a/sickrage.subfolder.conf.sample b/sickrage.subfolder.conf.sample
index 44afad6..eecc90a 100644
--- a/sickrage.subfolder.conf.sample
+++ b/sickrage.subfolder.conf.sample
@@ -11,6 +11,6 @@ location ^~ /sickrage {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_sickrage sickrage;
-    proxy_pass http://$upstream_sickrage:8081;
+    set $upstream_app sickrage;
+    proxy_pass http://$upstream_app:8081;
 }
diff --git a/smokeping.subdomain.conf.sample b/smokeping.subdomain.conf.sample
index f9c6e02..d14659b 100644
--- a/smokeping.subdomain.conf.sample
+++ b/smokeping.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_smokeping smokeping;
-        proxy_pass http://$upstream_smokeping;
+        set $upstream_app smokeping;
+        proxy_pass http://$upstream_app;
     }
 }
diff --git a/smokeping.subfolder.conf.sample b/smokeping.subfolder.conf.sample
index 28d95ba..3ff68aa 100644
--- a/smokeping.subfolder.conf.sample
+++ b/smokeping.subfolder.conf.sample
@@ -11,6 +11,6 @@ location ^~ /smokeping {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_smokeping smokeping;
-    proxy_pass http://$upstream_smokeping;
+    set $upstream_app smokeping;
+    proxy_pass http://$upstream_app;
 }
diff --git a/sonarr.subdomain.conf.sample b/sonarr.subdomain.conf.sample
index 0b25d5c..7800209 100644
--- a/sonarr.subdomain.conf.sample
+++ b/sonarr.subdomain.conf.sample
@@ -24,14 +24,14 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_sonarr sonarr;
-        proxy_pass http://$upstream_sonarr:8989;
+        set $upstream_app sonarr;
+        proxy_pass http://$upstream_app:8989;
     }
 
     location ~ (/sonarr)?/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_sonarr sonarr;
-        proxy_pass http://$upstream_sonarr:8989;
+        set $upstream_app sonarr;
+        proxy_pass http://$upstream_app:8989;
    }
 }
diff --git a/sonarr.subfolder.conf.sample b/sonarr.subfolder.conf.sample
index 1ef6f8c..30cc50a 100644
--- a/sonarr.subfolder.conf.sample
+++ b/sonarr.subfolder.conf.sample
@@ -11,13 +11,13 @@ location ^~ /sonarr {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_sonarr sonarr;
-    proxy_pass http://$upstream_sonarr:8989;
+    set $upstream_app sonarr;
+    proxy_pass http://$upstream_app:8989;
 }
 
 location ^~ /sonarr/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_sonarr sonarr;
-    proxy_pass http://$upstream_sonarr:8989;
+    set $upstream_app sonarr;
+    proxy_pass http://$upstream_app:8989;
 }
diff --git a/statping.subdomain.conf.sample b/statping.subdomain.conf.sample
index f2a78b6..43a4280 100644
--- a/statping.subdomain.conf.sample
+++ b/statping.subdomain.conf.sample
@@ -1,6 +1,6 @@
 # make sure that your dns has a cname set for statping and that your statping container is not using a base url
 # If you are using the SSL docker-compose.yml on the statping repo, then the container name will be set to statup.
-# On other compose examples, it might be named statping. In that case, change $upstream_statping statup to $upstream_statping statping
+# On other compose examples, it might be named statping. In that case, change $upstream_app statup to $upstream_app statping
 
 server {
     listen 443 ssl;
@@ -26,7 +26,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_statping statup;
-        proxy_pass http://$upstream_statping:8080;
+        set $upstream_app statup;
+        proxy_pass http://$upstream_app:8080;
     }
 }
diff --git a/syncthing.subdomain.conf.sample b/syncthing.subdomain.conf.sample
index 1bbe105..ba80702 100644
--- a/syncthing.subdomain.conf.sample
+++ b/syncthing.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_syncthing syncthing;
-        proxy_pass http://$upstream_syncthing:8384;
+        set $upstream_app syncthing;
+        proxy_pass http://$upstream_app:8384;
     }
 }
diff --git a/taisun.subdomain.conf.sample b/taisun.subdomain.conf.sample
index 064f0a0..7e1b51c 100644
--- a/taisun.subdomain.conf.sample
+++ b/taisun.subdomain.conf.sample
@@ -24,8 +24,8 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_taisun taisun;
-        proxy_pass http://$upstream_taisun:3000;
+        set $upstream_app taisun;
+        proxy_pass http://$upstream_app:3000;
         proxy_buffering off;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection $http_connection;
diff --git a/tautulli.subdomain.conf.sample b/tautulli.subdomain.conf.sample
index d8f0359..0b15912 100644
--- a/tautulli.subdomain.conf.sample
+++ b/tautulli.subdomain.conf.sample
@@ -24,14 +24,14 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_tautulli tautulli;
-        proxy_pass http://$upstream_tautulli:8181;
+        set $upstream_app tautulli;
+        proxy_pass http://$upstream_app:8181;
     }
 
     location ~ (/tautulli)?/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_tautulli tautulli;
-        proxy_pass http://$upstream_tautulli:8181;
+        set $upstream_app tautulli;
+        proxy_pass http://$upstream_app:8181;
     }
 }
diff --git a/tautulli.subfolder.conf.sample b/tautulli.subfolder.conf.sample
index b64cf12..814ed08 100644
--- a/tautulli.subfolder.conf.sample
+++ b/tautulli.subfolder.conf.sample
@@ -11,13 +11,13 @@ location ^~ /tautulli {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_tautulli tautulli;
-    proxy_pass http://$upstream_tautulli:8181;
+    set $upstream_app tautulli;
+    proxy_pass http://$upstream_app:8181;
 }
 
 location ^~ /tautulli/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_tautulli tautulli;
-    proxy_pass http://$upstream_tautulli:8181;
+    set $upstream_app tautulli;
+    proxy_pass http://$upstream_app:8181;
 }
diff --git a/tdarr.subdomain.conf.sample b/tdarr.subdomain.conf.sample
index f76faf2..d22aa71 100644
--- a/tdarr.subdomain.conf.sample
+++ b/tdarr.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_tdarr tdarr;
-        proxy_pass http://$upstream_tdarr:8265;
+        set $upstream_app tdarr;
+        proxy_pass http://$upstream_app:8265;
     }
 }
diff --git a/thelounge.subdomain.conf.sample b/thelounge.subdomain.conf.sample
index 2e57281..e3dbf89 100644
--- a/thelounge.subdomain.conf.sample
+++ b/thelounge.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_thelounge thelounge;
-        proxy_pass http://$upstream_thelounge:9000;
+        set $upstream_app thelounge;
+        proxy_pass http://$upstream_app:9000;
     }
 }
diff --git a/thelounge.subfolder.conf.sample b/thelounge.subfolder.conf.sample
index bca21e4..b1c048a 100644
--- a/thelounge.subfolder.conf.sample
+++ b/thelounge.subfolder.conf.sample
@@ -14,7 +14,7 @@ location ^~ /thelounge/ {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_thelounge thelounge;
+    set $upstream_app thelounge;
     rewrite /thelounge(.*) $1 break;
-    proxy_pass http://$upstream_thelounge:9000;
+    proxy_pass http://$upstream_app:9000;
 }
diff --git a/transmission.subdomain.conf.sample b/transmission.subdomain.conf.sample
index 7007f09..7839550 100644
--- a/transmission.subdomain.conf.sample
+++ b/transmission.subdomain.conf.sample
@@ -24,15 +24,15 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_transmission transmission;
+        set $upstream_app transmission;
         proxy_pass_header  X-Transmission-Session-Id;
-        proxy_pass http://$upstream_transmission:9091;
+        proxy_pass http://$upstream_app:9091;
     }
 
     location ~ (/transmission)?/rpc {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_transmission transmission;
-        proxy_pass http://$upstream_transmission:9091;
+        set $upstream_app transmission;
+        proxy_pass http://$upstream_app:9091;
     }
 }
diff --git a/transmission.subfolder.conf.sample b/transmission.subfolder.conf.sample
index 504c48e..1c1ab28 100644
--- a/transmission.subfolder.conf.sample
+++ b/transmission.subfolder.conf.sample
@@ -11,14 +11,14 @@ location ^~ /transmission {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_transmission transmission;
+    set $upstream_app transmission;
     proxy_pass_header  X-Transmission-Session-Id;
-    proxy_pass http://$upstream_transmission:9091;
+    proxy_pass http://$upstream_app:9091;
 }
 
 location ^~ /transmission/rpc {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_transmission transmission;
-    proxy_pass http://$upstream_transmission:9091;
+    set $upstream_app transmission;
+    proxy_pass http://$upstream_app:9091;
 }
diff --git a/tt-rss.subdomain.conf.sample b/tt-rss.subdomain.conf.sample
index 3f7b358..9d6ab36 100644
--- a/tt-rss.subdomain.conf.sample
+++ b/tt-rss.subdomain.conf.sample
@@ -24,9 +24,9 @@ server {
         #error_page 401 =200 /login;
         
         resolver 127.0.0.11 valid=30s;
-        set $upstream_tt_rss tt-rss;
-        proxy_pass http://$upstream_tt_rss:80;
-        proxy_redirect  http://$upstream_tt_rss:80 /;
+        set $upstream_app tt-rss;
+        proxy_pass http://$upstream_app:80;
+        proxy_redirect  http://$upstream_app:80 /;
         proxy_read_timeout 60s;
         proxy_set_header          Host            $host;
         proxy_set_header          X-Real-IP       $remote_addr;
diff --git a/ubooquity.subdomain.conf.sample b/ubooquity.subdomain.conf.sample
index 9216ade..caf91a0 100644
--- a/ubooquity.subdomain.conf.sample
+++ b/ubooquity.subdomain.conf.sample
@@ -24,28 +24,28 @@ server {
         
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_ubooquity ubooquity;
-        proxy_pass http://$upstream_ubooquity:2202;
+        set $upstream_app ubooquity;
+        proxy_pass http://$upstream_app:2202;
     }
 
     location /admin {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_ubooquity ubooquity;
-        proxy_pass http://$upstream_ubooquity:2203;
+        set $upstream_app ubooquity;
+        proxy_pass http://$upstream_app:2203;
     }
 
     location /admin-res {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_ubooquity ubooquity;
-        proxy_pass http://$upstream_ubooquity:2203;
+        set $upstream_app ubooquity;
+        proxy_pass http://$upstream_app:2203;
     }
 
     location /admin-api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_ubooquity ubooquity;
-        proxy_pass http://$upstream_ubooquity:2203;
+        set $upstream_app ubooquity;
+        proxy_pass http://$upstream_app:2203;
     }
 }
diff --git a/ubooquity.subfolder.conf.sample b/ubooquity.subfolder.conf.sample
index 9c118e5..84ef84e 100644
--- a/ubooquity.subfolder.conf.sample
+++ b/ubooquity.subfolder.conf.sample
@@ -11,13 +11,13 @@
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_ubooquity ubooquity;
-        proxy_pass http://$upstream_ubooquity:2202;
+        set $upstream_app ubooquity;
+        proxy_pass http://$upstream_app:2202;
     }
 
     location ^~ /ubooquity/admin {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_ubooquity ubooquity;
-        proxy_pass http://$upstream_ubooquity:2203;
+        set $upstream_app ubooquity;
+        proxy_pass http://$upstream_app:2203;
     }
diff --git a/unifi-controller.subdomain.conf.sample b/unifi-controller.subdomain.conf.sample
index 245914f..18b7c40 100644
--- a/unifi-controller.subdomain.conf.sample
+++ b/unifi-controller.subdomain.conf.sample
@@ -24,8 +24,8 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_unifi unifi-controller;
-        proxy_pass https://$upstream_unifi:8443;
+        set $upstream_app unifi-controller;
+        proxy_pass https://$upstream_app:8443;
     }
 
     location /wss {
@@ -39,8 +39,8 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_unifi unifi-controller;
-        proxy_pass https://$upstream_unifi:8443;
+        set $upstream_app unifi-controller;
+        proxy_pass https://$upstream_app:8443;
         proxy_buffering off;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "Upgrade";
diff --git a/znc.subdomain.conf.sample b/znc.subdomain.conf.sample
index 328812a..5650291 100644
--- a/znc.subdomain.conf.sample
+++ b/znc.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_znc znc;
-        proxy_pass http://$upstream_znc:6501;
+        set $upstream_app znc;
+        proxy_pass http://$upstream_app:6501;
     }
 }
\ No newline at end of file
diff --git a/znc.subfolder.conf.sample b/znc.subfolder.conf.sample
index fa3767f..decf3ef 100644
--- a/znc.subfolder.conf.sample
+++ b/znc.subfolder.conf.sample
@@ -11,6 +11,6 @@ location /znc {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_znc znc;
-    proxy_pass http://$upstream_znc:6501;
+    set $upstream_app znc;
+    proxy_pass http://$upstream_app:6501;
 }
\ No newline at end of file

From 0c24b78a0b10378c60a1ec630f52eff78a764f00 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Mon, 17 Feb 2020 17:05:10 -0600
Subject: [PATCH 055/126] Add Port and Proto variables

---
 adguard.subdomain.conf.sample          |  5 ++++-
 adminer.subfolder.conf.sample          |  5 ++++-
 airsonic.subdomain.conf.sample         |  7 ++++--
 airsonic.subfolder.conf.sample         |  5 ++++-
 bazarr.subdomain.conf.sample           |  5 ++++-
 bazarr.subfolder.conf.sample           |  5 ++++-
 beets.subdomain.conf.sample            |  7 ++++--
 beets.subfolder.conf.sample            |  5 ++++-
 bitwarden.subdomain.conf.sample        | 15 ++++++++++---
 booksonic.subdomain.conf.sample        |  7 ++++--
 booksonic.subfolder.conf.sample        |  5 ++++-
 calibre-web.subdomain.conf.sample      |  5 ++++-
 calibre-web.subfolder.conf.sample      |  5 ++++-
 calibre.subdomain.conf.sample          |  5 ++++-
 calibre.subfolder.conf.sample          |  7 ++++--
 code-server.subdomain.conf.sample      |  5 ++++-
 codimd.subdomain.conf.sample           |  7 ++++--
 collabora.subdomain.conf.sample        | 30 ++++++++++++++++++++------
 couchpotato.subdomain.conf.sample      |  5 ++++-
 couchpotato.subfolder.conf.sample      |  5 ++++-
 deluge.subdomain.conf.sample           |  5 ++++-
 deluge.subfolder.conf.sample           |  5 ++++-
 dillinger.subdomain.conf.sample        |  7 ++++--
 dokuwiki.subdomain.conf.sample         |  7 ++++--
 domoticz.subdomain.conf.sample         |  7 ++++--
 domoticz.subfolder.conf.sample         |  5 ++++-
 dozzle.subfolder.conf.sample           |  5 ++++-
 duplicati.subdomain.conf.sample        |  5 ++++-
 duplicati.subfolder.conf.sample        |  5 ++++-
 emby.subdomain.conf.sample             | 21 +++++++++++-------
 emby.subfolder.conf.sample             | 17 +++++++++------
 embystat.subdomain.conf.sample         |  5 ++++-
 flood.subdomain.conf.sample            |  5 ++++-
 flood.subfolder.conf.sample            |  5 ++++-
 freshrss.subdomain.conf.sample         |  6 ++++--
 freshrss.subfolder.conf.sample         |  6 ++++--
 ghost.subdomain.conf.sample            |  9 +++++---
 ghost.subfolder.conf.sample            |  7 ++++--
 gitea.subdomain.conf.sample            |  7 +++---
 gitea.subfolder.conf.sample            |  5 ++++-
 glances.subdomain.conf.sample          |  5 ++++-
 glances.subfolder.conf.sample          |  5 ++++-
 grafana.subdomain.conf.sample          |  5 ++++-
 grocy.subdomain.conf.sample            |  7 ++++--
 guacamole.subdomain.conf.sample        |  5 ++++-
 guacamole.subfolder.conf.sample        |  5 ++++-
 headphones.subdomain.conf.sample       |  5 ++++-
 headphones.subfolder.conf.sample       |  5 ++++-
 heimdall.subdomain.conf.sample         |  5 ++++-
 heimdall.subfolder.conf.sample         |  5 ++++-
 homeassistant.subdomain.conf.sample    | 10 +++++++--
 jackett.subdomain.conf.sample          | 10 +++++++--
 jackett.subfolder.conf.sample          | 10 +++++++--
 jellyfin.subdomain.conf.sample         | 21 +++++++++++-------
 jellyfin.subfolder.conf.sample         | 13 ++++++-----
 jenkins.subfolder.conf.sample          | 11 ++++++----
 kanzi.subdomain.conf.sample            |  5 ++++-
 kanzi.subfolder.conf.sample            |  5 ++++-
 lazylibrarian.subdomain.conf.sample    |  5 ++++-
 lazylibrarian.subfolder.conf.sample    |  5 ++++-
 librespeed.subdomain.com.sample        |  5 ++++-
 lidarr.subdomain.conf.sample           | 10 +++++++--
 lidarr.subfolder.conf.sample           | 10 +++++++--
 lychee.subdomain.conf.sample           |  5 ++++-
 medusa.subdomain.conf.sample           |  5 ++++-
 medusa.subfolder.conf.sample           |  5 ++++-
 monitorr.subdomain.conf.sample         |  5 ++++-
 monitorr.subfolder.conf.sample         |  5 ++++-
 mstream.subdomain.conf.sample          |  7 ++++--
 mylar.subdomain.conf.sample            |  5 ++++-
 mylar.subfolder.conf.sample            |  5 ++++-
 mytinytodo.subfolder.conf.sample       |  4 +++-
 netdata.subdomain.conf.sample          |  5 ++++-
 netdata.subfolder.conf.sample          |  5 ++++-
 nextcloud.subdomain.conf.sample        |  5 ++++-
 nextcloud.subfolder.conf.sample        |  8 ++++---
 nzbget.subdomain.conf.sample           | 20 +++++++++++++----
 nzbget.subfolder.conf.sample           | 20 +++++++++++++----
 nzbhydra.subdomain.conf.sample         | 30 ++++++++++++++++++++------
 nzbhydra.subfolder.conf.sample         | 30 ++++++++++++++++++++------
 ombi.subdomain.conf.sample             | 15 ++++++++++---
 ombi.subfolder.conf.sample             | 15 ++++++++++---
 openvpn-as.subdomain.conf.sample       |  9 ++++++--
 organizr-auth.subfolder.conf.sample    |  4 +++-
 organizr.subdomain.conf.sample         |  5 ++++-
 organizr.subfolder.conf.sample         |  5 ++++-
 osticket.subdomain.conf.sample         |  5 ++++-
 phpmyadmin.subdomain.conf.sample       |  5 ++++-
 phpmyadmin.subfolder.conf.sample       |  5 ++++-
 pihole.subdomain.conf.sample           | 10 +++++++--
 pihole.subfolder.conf.sample           | 10 +++++++--
 piwigo.subdomain.conf.sample           |  5 ++++-
 plex.subdomain.conf.sample             | 12 ++++++-----
 plex.subfolder.conf.sample             | 11 ++++++----
 plexwebtools.subdomain.conf.sample     |  5 ++++-
 plexwebtools.subfolder.conf.sample     |  5 ++++-
 portainer.subdomain.conf.sample        | 10 +++++++--
 portainer.subfolder.conf.sample        | 10 +++++++--
 prometheus.subdomain.conf.sample       |  5 ++++-
 pydio.subdomain.conf.sample            |  5 ++++-
 pyload.subdomain.conf.sample           |  5 ++++-
 qbittorrent.subdomain.conf.sample      | 29 +++++++++++++++++++------
 qbittorrent.subfolder.conf.sample      | 30 ++++++++++++++++++++------
 quassel-web.subdomain.conf.sample      |  7 ++++--
 quassel-web.subfolder.conf.sample      |  7 ++++--
 radarr.subdomain.conf.sample           | 10 +++++++--
 radarr.subfolder.conf.sample           | 10 +++++++--
 raneto.subdomain.conf.sample           |  7 ++++--
 resilio-sync.subdomain.conf.sample     |  5 ++++-
 rutorrent.subdomain.conf.sample        | 10 +++++++--
 rutorrent.subfolder.conf.sample        | 10 +++++++--
 sabnzbd.subdomain.conf.sample          | 10 +++++++--
 sabnzbd.subfolder.conf.sample          | 10 +++++++--
 scope.subfolder.conf.sample            |  7 ++++--
 sickrage.subdomain.conf.sample         |  5 ++++-
 sickrage.subfolder.conf.sample         |  5 ++++-
 smokeping.subdomain.conf.sample        |  5 ++++-
 smokeping.subfolder.conf.sample        |  5 ++++-
 sonarr.subdomain.conf.sample           | 10 +++++++--
 sonarr.subfolder.conf.sample           | 10 +++++++--
 statping.subdomain.conf.sample         |  5 ++++-
 syncthing.subdomain.conf.sample        |  5 ++++-
 taisun.subdomain.conf.sample           |  5 ++++-
 tautulli.subdomain.conf.sample         | 10 +++++++--
 tautulli.subfolder.conf.sample         | 10 +++++++--
 tdarr.subdomain.conf.sample            |  5 ++++-
 thelounge.subdomain.conf.sample        |  5 ++++-
 thelounge.subfolder.conf.sample        |  5 ++++-
 transmission.subdomain.conf.sample     | 10 +++++++--
 transmission.subfolder.conf.sample     | 10 +++++++--
 tt-rss.subdomain.conf.sample           |  7 ++++--
 ubooquity.subdomain.conf.sample        | 22 ++++++++++++++-----
 ubooquity.subfolder.conf.sample        | 10 +++++++--
 unifi-controller.subdomain.conf.sample | 10 +++++++--
 znc.subdomain.conf.sample              |  7 ++++--
 znc.subfolder.conf.sample              |  7 ++++--
 136 files changed, 856 insertions(+), 260 deletions(-)

diff --git a/adguard.subdomain.conf.sample b/adguard.subdomain.conf.sample
index 21c601c..6f409df 100644
--- 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
index 5d3545b..ec0f55a 100644
--- 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
index 605ee6e..80c1831 100644
--- 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
index e509e62..44be55c 100644
--- 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
index 56306f8..c8054a1 100644
--- 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
index 9cff8f4..a9bec6e 100644
--- 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
index 4873170..38d604e 100644
--- 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
index 3bfacb9..559e70d 100644
--- 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
index 03112d0..59daab6 100644
--- 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
index 01c4468..9f60aa5 100644
--- 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
index e205cee..203c2be 100644
--- 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
index 6054790..54e122a 100644
--- 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
index 1da0096..42bfd0e 100644
--- 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
index adb6373..8bc93e2 100644
--- 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
index 8b2bfac..94b48d5 100644
--- 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
index 0a7ce86..abeb37a 100644
--- 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
index c051008..8472978 100644
--- 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;
+
     }
-}
\ No newline at end of file
+}
diff --git a/collabora.subdomain.conf.sample b/collabora.subdomain.conf.sample
index bfe53ee..caebc04 100644
--- a/collabora.subdomain.conf.sample
+++ b/collabora.subdomain.conf.sample
@@ -12,7 +12,10 @@ 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;
     }
 
@@ -20,7 +23,10 @@ server {
     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;
     }
 
@@ -28,7 +34,10 @@ server {
     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;
     }
 
@@ -36,7 +45,10 @@ server {
     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,7 +59,10 @@ 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;
     }
 
@@ -55,7 +70,10 @@ server {
     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
index 27a0288..d72a016 100644
--- 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
index 937a14f..24aae5f 100644
--- 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
index b43cc3f..1bf40cd 100644
--- 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
index d1f4f9a..13b550d 100644
--- 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
index 97f7a88..16d1e48 100644
--- 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;
+
     }
-}
\ No newline at end of file
+}
diff --git a/dokuwiki.subdomain.conf.sample b/dokuwiki.subdomain.conf.sample
index 5f81c7f..a2655e3 100644
--- 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
index 226e106..9dc19aa 100644
--- 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;
+
     }
-}
\ No newline at end of file
+}
diff --git a/domoticz.subfolder.conf.sample b/domoticz.subfolder.conf.sample
index c8a77fc..ecd50c8 100644
--- a/domoticz.subfolder.conf.sample
+++ b/domoticz.subfolder.conf.sample
@@ -12,5 +12,8 @@ location ^~ /domoticz/ {
     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;
+
 }
diff --git a/dozzle.subfolder.conf.sample b/dozzle.subfolder.conf.sample
index 6fd4272..b433de0 100644
--- a/dozzle.subfolder.conf.sample
+++ b/dozzle.subfolder.conf.sample
@@ -18,5 +18,8 @@ location ^~ /dozzle/ {
     proxy_cache off;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app dozzle;
-    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/duplicati.subdomain.conf.sample b/duplicati.subdomain.conf.sample
index f6dc7a7..7e9a4d3 100644
--- a/duplicati.subdomain.conf.sample
+++ b/duplicati.subdomain.conf.sample
@@ -24,6 +24,9 @@ server {
 
         resolver 127.0.0.11 valid=30s;
         set $upstream_app duplicati;
-        proxy_pass http://$upstream_app:8200;
+        set $upstream_port 8200;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/duplicati.subfolder.conf.sample b/duplicati.subfolder.conf.sample
index 263f8a7..c7d580c 100644
--- a/duplicati.subfolder.conf.sample
+++ b/duplicati.subfolder.conf.sample
@@ -14,6 +14,9 @@ location ^~ /duplicati/ {
 
     resolver 127.0.0.11 valid=30s;
     set $upstream_app duplicati;
+    set $upstream_port 8200;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /duplicati(.*) $1 break;
-    proxy_pass http://$upstream_app:8200;
 }
diff --git a/emby.subdomain.conf.sample b/emby.subdomain.conf.sample
index 9efad40..f828be6 100644
--- a/emby.subdomain.conf.sample
+++ b/emby.subdomain.conf.sample
@@ -1,6 +1,7 @@
-# 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_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
+# make sure that your dns has a cname set for emby and that your emby container is not using a base url
+# if emby is running in bridge mode and the container is named "emby", the below config should work as is
+# if not, replace the line "set $upstream_app emby;" with "set $upstream_app <containername>;"
+# or "set $upstream_app <HOSTIP>;" for host mode, 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"
 
@@ -18,18 +19,22 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app emby;
-        proxy_pass http://$upstream_app:8096;
-		
+        set $upstream_port 8096;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_set_header Range $http_range;
         proxy_set_header If-Range $http_if_range;
     }
-	
+
     location ~ (/emby)?/socket {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app emby;
-        proxy_pass http://$upstream_app:8096;
-		
+        set $upstream_port 8096;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection $http_connection;
    }
diff --git a/emby.subfolder.conf.sample b/emby.subfolder.conf.sample
index 7d62fd5..f114167 100644
--- a/emby.subfolder.conf.sample
+++ b/emby.subfolder.conf.sample
@@ -1,6 +1,7 @@
-# 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_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
+# make sure that your dns has a cname set for emby
+# if emby is running in bridge mode and the container is named "emby", the below config should work as is
+# if not, replace the line "set $upstream_app emby;" with "set $upstream_app <containername>;"
+# or "set $upstream_app <HOSTIP>;" for host mode, 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 subdomain,
 # and set the "Secure connection mode" to "Handled by reverse proxy"
 
@@ -11,8 +12,10 @@ location ^~ /emby/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app emby;
-    proxy_pass http://$upstream_app:8096;
-    
+    set $upstream_port 8096;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     proxy_set_header Range $http_range;
     proxy_set_header If-Range $http_if_range;
 }
@@ -21,7 +24,9 @@ location ^~ /embywebsocket {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app emby;
-    proxy_pass http://$upstream_app:8096;
+    set $upstream_port 8096;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection $http_connection;
diff --git a/embystat.subdomain.conf.sample b/embystat.subdomain.conf.sample
index b166cf8..37e0d4b 100644
--- a/embystat.subdomain.conf.sample
+++ b/embystat.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app embystat;
-        proxy_pass http://$upstream_app:6555;
+        set $upstream_port 6555;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/flood.subdomain.conf.sample b/flood.subdomain.conf.sample
index 0ab0f3c..bb37158 100644
--- a/flood.subdomain.conf.sample
+++ b/flood.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app flood;
-        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/flood.subfolder.conf.sample b/flood.subfolder.conf.sample
index caa98b4..b6dff64 100644
--- a/flood.subfolder.conf.sample
+++ b/flood.subfolder.conf.sample
@@ -15,6 +15,9 @@ location ^~ /flood/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app flood;
+    set $upstream_port 3000;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /flood(.*) $1 break;
-    proxy_pass http://$upstream_app:3000;
 }
diff --git a/freshrss.subdomain.conf.sample b/freshrss.subdomain.conf.sample
index aba0e34..7620169 100644
--- a/freshrss.subdomain.conf.sample
+++ b/freshrss.subdomain.conf.sample
@@ -25,8 +25,10 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app freshrss;
-        proxy_pass http://$upstream_app;
-        
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_redirect off;
         proxy_buffering off;
         proxy_set_header Host $host;
diff --git a/freshrss.subfolder.conf.sample b/freshrss.subfolder.conf.sample
index 497f400..d7b0ae7 100644
--- a/freshrss.subfolder.conf.sample
+++ b/freshrss.subfolder.conf.sample
@@ -16,9 +16,11 @@ location ^~ /freshrss/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app freshrss;
+    set $upstream_port 80;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /freshrss(.*) $1 break;
-    proxy_pass http://$upstream_app:80;
-    
     proxy_redirect off;
     proxy_buffering off;
     proxy_set_header Host $host;
diff --git a/ghost.subdomain.conf.sample b/ghost.subdomain.conf.sample
index c6b38e4..370cbfe 100644
--- a/ghost.subdomain.conf.sample
+++ b/ghost.subdomain.conf.sample
@@ -25,7 +25,10 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app ghost;
-        proxy_pass http://$upstream_app:2368;
-        proxy_redirect off;	
-    }	
+        set $upstream_port 2368;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+        proxy_redirect off;
+    }
 }
diff --git a/ghost.subfolder.conf.sample b/ghost.subfolder.conf.sample
index 18491ee..b6310f7 100644
--- a/ghost.subfolder.conf.sample
+++ b/ghost.subfolder.conf.sample
@@ -9,10 +9,13 @@ location /blog {
   #enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
   #auth_request /auth;
   #error_page 401 =200 /login;
-	
+
   include /config/nginx/proxy.conf;
   resolver 127.0.0.11 valid=30s;
   set $upstream_app ghost;
-  proxy_pass http://$upstream_app:2368;
+  set $upstream_port 2368;
+  set $upstream_proto http;
+  proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
   proxy_redirect off;
 }
diff --git a/gitea.subdomain.conf.sample b/gitea.subdomain.conf.sample
index 05d5dc3..c957cb3 100644
--- a/gitea.subdomain.conf.sample
+++ b/gitea.subdomain.conf.sample
@@ -4,8 +4,6 @@
 # ROOT_URL         = https://gitea.server.com/
 # DOMAIN           = gitea.server.com
 
-
-
 server {
     listen 443 ssl;
     listen [::]:443 ssl;
@@ -31,6 +29,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app gitea;
-        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/gitea.subfolder.conf.sample b/gitea.subfolder.conf.sample
index 9b2aff0..8d37eab 100644
--- a/gitea.subfolder.conf.sample
+++ b/gitea.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /gitea/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app gitea;
+    set $upstream_port 3000;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /gitea(.*) $1 break;
-    proxy_pass http://$upstream_app:3000;
 }
diff --git a/glances.subdomain.conf.sample b/glances.subdomain.conf.sample
index bbe846d..fd619e9 100644
--- a/glances.subdomain.conf.sample
+++ b/glances.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app glances;
-        proxy_pass http://$upstream_app:61208;
+        set $upstream_port 61208;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/glances.subfolder.conf.sample b/glances.subfolder.conf.sample
index 701bd6a..611a6e3 100644
--- a/glances.subfolder.conf.sample
+++ b/glances.subfolder.conf.sample
@@ -15,6 +15,9 @@ location ^~ /glances/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app glances;
+    set $upstream_port 61208;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /glances(.*) $1 break;
-    proxy_pass http://$upstream_app:61208;
 }
diff --git a/grafana.subdomain.conf.sample b/grafana.subdomain.conf.sample
index 67af2cf..5190106 100644
--- a/grafana.subdomain.conf.sample
+++ b/grafana.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app grafana;
-        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/grocy.subdomain.conf.sample b/grocy.subdomain.conf.sample
index e4c0705..6bd603c 100644
--- a/grocy.subdomain.conf.sample
+++ b/grocy.subdomain.conf.sample
@@ -25,7 +25,10 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app grocy;
-        proxy_pass http://$upstream_app:80;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
-}
\ No newline at end of file
+}
diff --git a/guacamole.subdomain.conf.sample b/guacamole.subdomain.conf.sample
index e74eef1..3b449b0 100644
--- a/guacamole.subdomain.conf.sample
+++ b/guacamole.subdomain.conf.sample
@@ -26,6 +26,9 @@ server {
         proxy_buffering off;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app guacamole;
-        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/guacamole.subfolder.conf.sample b/guacamole.subfolder.conf.sample
index 0ab1978..074461d 100644
--- a/guacamole.subfolder.conf.sample
+++ b/guacamole.subfolder.conf.sample
@@ -16,6 +16,9 @@ location ^~ /guacamole/ {
     proxy_buffering off;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app guacamole;
+    set $upstream_port 8080;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /guacamole(.*) $1 break;
-    proxy_pass http://$upstream_app:8080;
 }
diff --git a/headphones.subdomain.conf.sample b/headphones.subdomain.conf.sample
index 5e91780..68daa69 100644
--- a/headphones.subdomain.conf.sample
+++ b/headphones.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app headphones;
-        proxy_pass http://$upstream_app:8181;
+        set $upstream_port 8181;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/headphones.subfolder.conf.sample b/headphones.subfolder.conf.sample
index 70499e0..7c4c56d 100644
--- a/headphones.subfolder.conf.sample
+++ b/headphones.subfolder.conf.sample
@@ -12,5 +12,8 @@ location ^~ /headphones {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app headphones;
-    proxy_pass http://$upstream_app:8181;
+    set $upstream_port 8181;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/heimdall.subdomain.conf.sample b/heimdall.subdomain.conf.sample
index 3df0abe..1f97e69 100644
--- a/heimdall.subdomain.conf.sample
+++ b/heimdall.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app heimdall;
-        proxy_pass https://$upstream_app:443;
+        set $upstream_port 443;
+        set $upstream_proto https;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/heimdall.subfolder.conf.sample b/heimdall.subfolder.conf.sample
index bdd81b3..50b92d0 100644
--- a/heimdall.subfolder.conf.sample
+++ b/heimdall.subfolder.conf.sample
@@ -12,5 +12,8 @@ location / {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app heimdall;
-    proxy_pass https://$upstream_app:443;
+    set $upstream_port 443;
+    set $upstream_proto https;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/homeassistant.subdomain.conf.sample b/homeassistant.subdomain.conf.sample
index b906d43..07d8fd1 100644
--- a/homeassistant.subdomain.conf.sample
+++ b/homeassistant.subdomain.conf.sample
@@ -25,13 +25,19 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app homeassistant;
-        proxy_pass http://$upstream_app:8123;
+        set $upstream_port 8123;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location /api/websocket {
         resolver 127.0.0.11 valid=30s;
         set $upstream_app homeassistant;
-        proxy_pass http://$upstream_app:8123;
+        set $upstream_port 8123;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_set_header Host $host;
 
         proxy_http_version 1.1;
diff --git a/jackett.subdomain.conf.sample b/jackett.subdomain.conf.sample
index 017d06e..a51fe08 100644
--- a/jackett.subdomain.conf.sample
+++ b/jackett.subdomain.conf.sample
@@ -25,13 +25,19 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app jackett;
-        proxy_pass http://$upstream_app:9117;
+        set $upstream_port 9117;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location ~ (/jackett)?/(api|dl) {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app jackett;
-        proxy_pass http://$upstream_app:9117;
+        set $upstream_port 9117;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/jackett.subfolder.conf.sample b/jackett.subfolder.conf.sample
index 3ed1b73..7e04001 100644
--- a/jackett.subfolder.conf.sample
+++ b/jackett.subfolder.conf.sample
@@ -12,12 +12,18 @@ location /jackett {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app jackett;
-    proxy_pass http://$upstream_app:9117;
+    set $upstream_port 9117;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
 
 location ~ /jackett/(api|dl) {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app jackett;
-    proxy_pass http://$upstream_app:9117;
+    set $upstream_port 9117;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/jellyfin.subdomain.conf.sample b/jellyfin.subdomain.conf.sample
index 763da91..88c25e1 100644
--- a/jellyfin.subdomain.conf.sample
+++ b/jellyfin.subdomain.conf.sample
@@ -1,6 +1,7 @@
-# make sure that your dns has a cname set for jellyfin, if jellyfin is running in bridge mode, the below config should work as is, although,
-# the container name is expected to be "jellyfin", if not, replace the lines "set $upstream_app jellyfin;" 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 jellyfin
+# make sure that your dns has a cname set for jellyfin
+# if jellyfin is running in bridge mode and the container is named "jellyfin", the below config should work as is
+# if not, replace the line "set $upstream_app jellyfin;" with "set $upstream_app <containername>;"
+# or "set $upstream_app <HOSTIP>;" for host mode, HOSTIP being the IP address of jellyfin
 # in jellyfin settings, under "Advanced/Networking" change the public https port to 443, leave the local ports as is,
 # and set the "Secure connection mode" to "Handled by reverse proxy"
 
@@ -18,18 +19,22 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app jellyfin;
-        proxy_pass http://$upstream_app:8096;
-		
+        set $upstream_port 8096;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_set_header Range $http_range;
         proxy_set_header If-Range $http_if_range;
     }
-	
+
     location ~ (/jellyfin)?/socket {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app jellyfin;
-        proxy_pass http://$upstream_app:8096;
-		
+        set $upstream_port 8096;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection $http_connection;
    }
diff --git a/jellyfin.subfolder.conf.sample b/jellyfin.subfolder.conf.sample
index 2db8143..abebb57 100644
--- a/jellyfin.subfolder.conf.sample
+++ b/jellyfin.subfolder.conf.sample
@@ -1,6 +1,7 @@
-# if jellyfin is running in bridge mode, the below config should work as is, although, the container name is expected to be "jellyfin",
-# if not, replace the lines "set $upstream_app jellyfin;" 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 jellyfin
+# make sure that your dns has a cname set for jellyfin
+# if jellyfin is running in bridge mode and the container is named "jellyfin", the below config should work as is
+# if not, replace the line "set $upstream_app jellyfin;" with "set $upstream_app <containername>;"
+# or "set $upstream_app <HOSTIP>;" for host mode, HOSTIP being the IP address of jellyfin
 # in jellyfin settings, under "Advanced/Networking" change the public https port to 443, leave the local ports as is, set the base url to "/jellyfin",
 # and set the "Secure connection mode" to "Handled by reverse proxy"
 
@@ -11,8 +12,10 @@ location ^~ /jellyfin/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app jellyfin;
-    proxy_pass http://$upstream_app:8096;
-    
+    set $upstream_port 8096;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     proxy_set_header Range $http_range;
     proxy_set_header If-Range $http_if_range;
     proxy_set_header Upgrade $http_upgrade;
diff --git a/jenkins.subfolder.conf.sample b/jenkins.subfolder.conf.sample
index 9c33335..cfef5ce 100644
--- a/jenkins.subfolder.conf.sample
+++ b/jenkins.subfolder.conf.sample
@@ -17,13 +17,16 @@ location ^~ /jenkins/ {
 	client_max_body_size 10m;
 
 	sendfile off;
-   
+
     include /config/nginx/proxy.conf;
     proxy_max_temp_file_size 0;
     proxy_temp_file_write_size 64k;
     proxy_request_buffering off;
     proxy_buffering off;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_app jenkins;    
-    proxy_pass http://$upstream_app:8080;
-}
\ No newline at end of file
+    set $upstream_app jenkins;
+    set $upstream_port 8080;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+}
diff --git a/kanzi.subdomain.conf.sample b/kanzi.subdomain.conf.sample
index e478467..bf92ef4 100644
--- a/kanzi.subdomain.conf.sample
+++ b/kanzi.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app kanzi;
-        proxy_pass https://$upstream_app:8000;
+        set $upstream_port 8000;
+        set $upstream_proto https;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/kanzi.subfolder.conf.sample b/kanzi.subfolder.conf.sample
index 2e3b585..6227cfd 100644
--- a/kanzi.subfolder.conf.sample
+++ b/kanzi.subfolder.conf.sample
@@ -15,6 +15,9 @@ location ^~ /kanzi/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app kanzi;
+    set $upstream_port 8000;
+    set $upstream_proto https;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /kanzi(.*) $1 break;
-    proxy_pass https://$upstream_app:8000;
 }
diff --git a/lazylibrarian.subdomain.conf.sample b/lazylibrarian.subdomain.conf.sample
index c9d3a77..ada4918 100644
--- a/lazylibrarian.subdomain.conf.sample
+++ b/lazylibrarian.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app lazylibrarian;
-        proxy_pass http://$upstream_app:5299;
+        set $upstream_port 5299;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/lazylibrarian.subfolder.conf.sample b/lazylibrarian.subfolder.conf.sample
index 93f26d6..682822a 100644
--- a/lazylibrarian.subfolder.conf.sample
+++ b/lazylibrarian.subfolder.conf.sample
@@ -12,5 +12,8 @@ location ^~ /lazylibrarian {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app lazylibrarian;
-    proxy_pass http://$upstream_app:5299;
+    set $upstream_port 5299;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/librespeed.subdomain.com.sample b/librespeed.subdomain.com.sample
index 1fc4388..e66804b 100644
--- a/librespeed.subdomain.com.sample
+++ b/librespeed.subdomain.com.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app librespeed;
-        proxy_pass http://$upstream_app;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/lidarr.subdomain.conf.sample b/lidarr.subdomain.conf.sample
index c982d73..36d267c 100644
--- a/lidarr.subdomain.conf.sample
+++ b/lidarr.subdomain.conf.sample
@@ -25,13 +25,19 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app lidarr;
-        proxy_pass http://$upstream_app:8686;
+        set $upstream_port 8686;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location ~ (/lidarr)?/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app lidarr;
-        proxy_pass http://$upstream_app:8686;
+        set $upstream_port 8686;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/lidarr.subfolder.conf.sample b/lidarr.subfolder.conf.sample
index bd2e9bf..f1ffee6 100644
--- a/lidarr.subfolder.conf.sample
+++ b/lidarr.subfolder.conf.sample
@@ -12,12 +12,18 @@ location ^~ /lidarr {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app lidarr;
-    proxy_pass http://$upstream_app:8686;
+    set $upstream_port 8686;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
 
 location ^~ /lidarr/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app lidarr;
-    proxy_pass http://$upstream_app:8686;
+    set $upstream_port 8686;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/lychee.subdomain.conf.sample b/lychee.subdomain.conf.sample
index 1c26191..4c6619e 100644
--- a/lychee.subdomain.conf.sample
+++ b/lychee.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app lychee;
-        proxy_pass http://$upstream_app;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/medusa.subdomain.conf.sample b/medusa.subdomain.conf.sample
index 452d0db..a9bbcd2 100644
--- a/medusa.subdomain.conf.sample
+++ b/medusa.subdomain.conf.sample
@@ -27,6 +27,9 @@ server {
         proxy_set_header Connection "upgrade";
         resolver 127.0.0.11 valid=30s;
         set $upstream_app medusa;
-        proxy_pass http://$upstream_app:8081;
+        set $upstream_port 8081;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/medusa.subfolder.conf.sample b/medusa.subfolder.conf.sample
index 9010f6d..1935744 100644
--- a/medusa.subfolder.conf.sample
+++ b/medusa.subfolder.conf.sample
@@ -14,5 +14,8 @@ location ^~ /medusa {
     proxy_set_header Connection "upgrade";
     resolver 127.0.0.11 valid=30s;
     set $upstream_app medusa;
-    proxy_pass http://$upstream_app:8081;
+    set $upstream_port 8081;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/monitorr.subdomain.conf.sample b/monitorr.subdomain.conf.sample
index fc5d902..79572fb 100644
--- a/monitorr.subdomain.conf.sample
+++ b/monitorr.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app monitorr;
-        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/monitorr.subfolder.conf.sample b/monitorr.subfolder.conf.sample
index 69e84bf..da4fde2 100644
--- a/monitorr.subfolder.conf.sample
+++ b/monitorr.subfolder.conf.sample
@@ -15,5 +15,8 @@ location ^~ /monitorr/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app monitorr;
-    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/mstream.subdomain.conf.sample b/mstream.subdomain.conf.sample
index c6aa2e7..c1da8e2 100644
--- a/mstream.subdomain.conf.sample
+++ b/mstream.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 mstream;
-        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/mylar.subdomain.conf.sample b/mylar.subdomain.conf.sample
index 9d001be..2438a30 100644
--- a/mylar.subdomain.conf.sample
+++ b/mylar.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app mylar;
-        proxy_pass http://$upstream_app:8090;
+        set $upstream_port 8090;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/mylar.subfolder.conf.sample b/mylar.subfolder.conf.sample
index b35fb44..d1bd203 100644
--- a/mylar.subfolder.conf.sample
+++ b/mylar.subfolder.conf.sample
@@ -12,5 +12,8 @@ location ^~ /mylar {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app mylar;
-    proxy_pass http://$upstream_app:8090;
+    set $upstream_port 8090;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/mytinytodo.subfolder.conf.sample b/mytinytodo.subfolder.conf.sample
index 39c65de..bb727e1 100644
--- a/mytinytodo.subfolder.conf.sample
+++ b/mytinytodo.subfolder.conf.sample
@@ -17,5 +17,7 @@ location ^~ /todo/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app mytinytodo;
-    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/netdata.subdomain.conf.sample b/netdata.subdomain.conf.sample
index 7577191..3d14ea5 100644
--- a/netdata.subdomain.conf.sample
+++ b/netdata.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app netdata;
-        proxy_pass http://$upstream_app:19999;
+        set $upstream_port 19999;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/netdata.subfolder.conf.sample b/netdata.subfolder.conf.sample
index efc52ca..f41325e 100644
--- a/netdata.subfolder.conf.sample
+++ b/netdata.subfolder.conf.sample
@@ -15,6 +15,9 @@ location ^~ /netdata/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app netdata;
+    set $upstream_port 19999;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /netdata(.*) $1 break;
-    proxy_pass http://$upstream_app:19999;
 }
diff --git a/nextcloud.subdomain.conf.sample b/nextcloud.subdomain.conf.sample
index 1acf745..ab2281c 100644
--- a/nextcloud.subdomain.conf.sample
+++ b/nextcloud.subdomain.conf.sample
@@ -26,7 +26,10 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app nextcloud;
+        set $upstream_port 443;
+        set $upstream_proto https;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_max_temp_file_size 2048m;
-        proxy_pass https://$upstream_app:443;
     }
 }
diff --git a/nextcloud.subfolder.conf.sample b/nextcloud.subfolder.conf.sample
index d16853d..7b14687 100644
--- a/nextcloud.subfolder.conf.sample
+++ b/nextcloud.subfolder.conf.sample
@@ -27,9 +27,11 @@ location ^~ /nextcloud/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app nextcloud;
+    set $upstream_port 443;
+    set $upstream_proto https;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /nextcloud(.*) $1 break;
-    proxy_pass https://$upstream_app:443;
-    
     proxy_max_temp_file_size 2048m;
 
     proxy_set_header Range $http_range;
@@ -37,4 +39,4 @@ location ^~ /nextcloud/ {
     proxy_set_header Connection $http_connection;
     proxy_redirect off;
     proxy_ssl_session_reuse off;
-} 
+}
diff --git a/nzbget.subdomain.conf.sample b/nzbget.subdomain.conf.sample
index cd3de0c..97f7376 100644
--- a/nzbget.subdomain.conf.sample
+++ b/nzbget.subdomain.conf.sample
@@ -25,27 +25,39 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app nzbget;
-        proxy_pass http://$upstream_app:6789;
+        set $upstream_port 6789;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location ~ (/nzbget)?(/[^\/:]*:[^\/:]*)?/jsonrpc {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app nzbget;
-        proxy_pass http://$upstream_app:6789;
+        set $upstream_port 6789;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location ~ (/nzbget)?(/[^\/:]*:[^\/]*)?/jsonprpc {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app nzbget;
-        proxy_pass http://$upstream_app:6789;
+        set $upstream_port 6789;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location ~ (/nzbget)?(/[^\/:]*:[^\/]*)?/xmlrpc {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app nzbget;
-        proxy_pass http://$upstream_app:6789;
+        set $upstream_port 6789;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/nzbget.subfolder.conf.sample b/nzbget.subfolder.conf.sample
index c700f58..906331d 100644
--- a/nzbget.subfolder.conf.sample
+++ b/nzbget.subfolder.conf.sample
@@ -12,26 +12,38 @@ location /nzbget {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app nzbget;
-    proxy_pass http://$upstream_app:6789;
+    set $upstream_port 6789;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
 
 location ~ /nzbget(/[^\/:]*:[^\/]*)?/jsonrpc {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app nzbget;
-    proxy_pass http://$upstream_app:6789;
+    set $upstream_port 6789;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
 
 location ~ /nzbget(/[^\/:]*:[^\/]*)?/jsonprpc {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app nzbget;
-    proxy_pass http://$upstream_app:6789;
+    set $upstream_port 6789;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
 
 location ~ /nzbget(/[^\/:]*:[^\/]*)?/xmlrpc {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app nzbget;
-    proxy_pass http://$upstream_app:6789;
+    set $upstream_port 6789;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/nzbhydra.subdomain.conf.sample b/nzbhydra.subdomain.conf.sample
index 536558e..f8d2a81 100644
--- a/nzbhydra.subdomain.conf.sample
+++ b/nzbhydra.subdomain.conf.sample
@@ -25,42 +25,60 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app hydra2;
-        proxy_pass http://$upstream_app:5076;
+        set $upstream_port 5076;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location ~ (/nzbhydra)?/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app hydra2;
-        proxy_pass http://$upstream_app:5076;
+        set $upstream_port 5076;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location ~ (/nzbhydra)?/getnzb {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app hydra2;
-        proxy_pass http://$upstream_app:5076;
+        set $upstream_port 5076;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location ~ (/nzbhydra)?/gettorrent {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app hydra2;
-        proxy_pass http://$upstream_app:5076;
+        set $upstream_port 5076;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location ~ (/nzbhydra)?/rss {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app hydra2;
-        proxy_pass http://$upstream_app:5076;
+        set $upstream_port 5076;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location ~ (/nzbhydra)?/torznab/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app hydra2;
-        proxy_pass http://$upstream_app:5076;
+        set $upstream_port 5076;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
 }
diff --git a/nzbhydra.subfolder.conf.sample b/nzbhydra.subfolder.conf.sample
index dc3abed..0bc40c1 100644
--- a/nzbhydra.subfolder.conf.sample
+++ b/nzbhydra.subfolder.conf.sample
@@ -12,40 +12,58 @@ location ^~ /nzbhydra {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app hydra2;
-    proxy_pass http://$upstream_app:5076;
+    set $upstream_port 5076;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
 
 location ^~ /nzbhydra/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app hydra2;
-    proxy_pass http://$upstream_app:5076;
+    set $upstream_port 5076;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
 
 location ^~ /nzbhydra/getnzb {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app hydra2;
-    proxy_pass http://$upstream_app:5076;
+    set $upstream_port 5076;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
 
 location ^~ /nzbhydra/gettorrent {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app hydra2;
-    proxy_pass http://$upstream_app:5076;
+    set $upstream_port 5076;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
 
 location ^~ /nzbhydra/rss {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app hydra2;
-    proxy_pass http://$upstream_app:5076;
+    set $upstream_port 5076;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
 
 location ^~ /nzbhydra/torznab/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app hydra2;
-    proxy_pass http://$upstream_app:5076;
+    set $upstream_port 5076;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/ombi.subdomain.conf.sample b/ombi.subdomain.conf.sample
index e6b71e1..862aa10 100644
--- a/ombi.subdomain.conf.sample
+++ b/ombi.subdomain.conf.sample
@@ -25,7 +25,10 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app ombi;
-        proxy_pass http://$upstream_app:3579;
+        set $upstream_port 3579;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     # This allows access to the actual api
@@ -33,7 +36,10 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app ombi;
-        proxy_pass http://$upstream_app:3579;
+        set $upstream_port 3579;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
    }
 
     # This allows access to the documentation for the api
@@ -41,7 +47,10 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app ombi;
-        proxy_pass http://$upstream_app:3579;
+        set $upstream_port 3579;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
    }
    if ($http_referer ~* /ombi) {
        rewrite ^/swagger/(.*) /ombi/swagger/$1? redirect;
diff --git a/ombi.subfolder.conf.sample b/ombi.subfolder.conf.sample
index 4c02314..1cea015 100644
--- a/ombi.subfolder.conf.sample
+++ b/ombi.subfolder.conf.sample
@@ -16,7 +16,10 @@ location ^~ /ombi/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app ombi;
-    proxy_pass http://$upstream_app:3579;
+    set $upstream_port 3579;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
 
 # This allows access to the actual api
@@ -24,7 +27,10 @@ location ^~ /ombi/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app ombi;
-    proxy_pass http://$upstream_app:3579;
+    set $upstream_port 3579;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
 if ($http_referer ~* /ombi) {
     rewrite ^/api/(.*) /ombi/api/$1? redirect;
@@ -35,7 +41,10 @@ location ^~ /ombi/swagger {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app ombi;
-    proxy_pass http://$upstream_app:3579;
+    set $upstream_port 3579;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
 if ($http_referer ~* /ombi) {
     rewrite ^/swagger/(.*) /ombi/swagger/$1? redirect;
diff --git a/openvpn-as.subdomain.conf.sample b/openvpn-as.subdomain.conf.sample
index 5be1215..3b0803d 100644
--- a/openvpn-as.subdomain.conf.sample
+++ b/openvpn-as.subdomain.conf.sample
@@ -25,7 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app openvpn-as;
-        proxy_pass https://$upstream_app:943;
+        set $upstream_port 943;
+        set $upstream_proto https;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
     }
 
@@ -41,6 +43,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app openvpn-as;
-        proxy_pass https://$upstream_app:943;
+        set $upstream_port 943;
+        set $upstream_proto https;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/organizr-auth.subfolder.conf.sample b/organizr-auth.subfolder.conf.sample
index 3bb22da..b8c358d 100644
--- a/organizr-auth.subfolder.conf.sample
+++ b/organizr-auth.subfolder.conf.sample
@@ -18,7 +18,9 @@ location ~ /auth-([0-9]+) {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app organizr;
-    proxy_pass http://$upstream_app:80/api/?v1/auth&group=$1;
+    set $upstream_port 80;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port/api/?v1/auth&group=$1;
     proxy_set_header Content-Length "";
 
     # Do not uncomment the lines below, these are examples for usue in other proxy configs
diff --git a/organizr.subdomain.conf.sample b/organizr.subdomain.conf.sample
index 78b95a5..4bd4ff3 100644
--- a/organizr.subdomain.conf.sample
+++ b/organizr.subdomain.conf.sample
@@ -25,7 +25,10 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app organizr;
-        proxy_pass http://$upstream_app:80;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     # Optional redirect server errors to organizr error pages
diff --git a/organizr.subfolder.conf.sample b/organizr.subfolder.conf.sample
index 11df71c..aae5aff 100644
--- a/organizr.subfolder.conf.sample
+++ b/organizr.subfolder.conf.sample
@@ -12,7 +12,10 @@ location / {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app organizr;
-    proxy_pass http://$upstream_app:80;
+    set $upstream_port 80;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
 
 # Optional redirect server errors to organizr error pages
diff --git a/osticket.subdomain.conf.sample b/osticket.subdomain.conf.sample
index e2ef2d5..f79c597 100644
--- a/osticket.subdomain.conf.sample
+++ b/osticket.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app osticket;
-        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/phpmyadmin.subdomain.conf.sample b/phpmyadmin.subdomain.conf.sample
index 623f29f..83844e4 100644
--- a/phpmyadmin.subdomain.conf.sample
+++ b/phpmyadmin.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app phpmyadmin;
-        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/phpmyadmin.subfolder.conf.sample b/phpmyadmin.subfolder.conf.sample
index 727f35c..c9ddee0 100644
--- a/phpmyadmin.subfolder.conf.sample
+++ b/phpmyadmin.subfolder.conf.sample
@@ -15,6 +15,9 @@ location ^~ /phpmyadmin/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app phpmyadmin;
+    set $upstream_port 80;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /phpmyadmin(.*) $1 break;
-    proxy_pass http://$upstream_app:80;
 }
diff --git a/pihole.subdomain.conf.sample b/pihole.subdomain.conf.sample
index 5b0ecd6..145d7cf 100644
--- a/pihole.subdomain.conf.sample
+++ b/pihole.subdomain.conf.sample
@@ -25,7 +25,10 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app pihole;
-        proxy_pass http://$upstream_app:80;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_hide_header X-Frame-Options;
     }
 
@@ -41,7 +44,10 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app pihole;
-        proxy_pass http://$upstream_app:80;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_hide_header X-Frame-Options;
     }
 }
diff --git a/pihole.subfolder.conf.sample b/pihole.subfolder.conf.sample
index b1b399a..b6c5877 100644
--- a/pihole.subfolder.conf.sample
+++ b/pihole.subfolder.conf.sample
@@ -15,8 +15,11 @@ location ^~ /pihole/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app pihole;
+    set $upstream_port 80;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /pihole(.*) $1 break;
-    proxy_pass http://$upstream_app:80;
     proxy_hide_header X-Frame-Options;
 }
 
@@ -35,7 +38,10 @@ location ^~ /pihole/admin/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app pihole;
+    set $upstream_port 80;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /pihole(.*) $1 break;
-    proxy_pass http://$upstream_app:80;
     proxy_hide_header X-Frame-Options;
 }
diff --git a/piwigo.subdomain.conf.sample b/piwigo.subdomain.conf.sample
index 71585c2..e333945 100644
--- a/piwigo.subdomain.conf.sample
+++ b/piwigo.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app piwigo;
-        proxy_pass http://$upstream_app;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/plex.subdomain.conf.sample b/plex.subdomain.conf.sample
index 89330bf..aa43513 100644
--- a/plex.subdomain.conf.sample
+++ b/plex.subdomain.conf.sample
@@ -1,5 +1,7 @@
-# make sure that your dns has a cname set for plex, if plex is running in bridge mode, the below config should work as is, for host mode,
-# replace the line "proxy_pass http://$upstream_app:32400;" with "proxy_pass http://HOSTIP:32400;" HOSTIP being the IP address of plex
+# make sure that your dns has a cname set for plex
+# if plex is running in bridge mode and the container is named "plex", the below config should work as is
+# if not, replace the line "set $upstream_app plex;" with "set $upstream_app <containername>;"
+# or "set $upstream_app <HOSTIP>;" for host mode, HOSTIP being the IP address of plex
 # in plex server settings, under network, fill in "Custom server access URLs" with your domain (ie. "https://plex.yourdomain.url:443")
 
 server {
@@ -16,8 +18,6 @@ server {
 
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
-
-
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -30,7 +30,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app plex;
-        proxy_pass http://$upstream_app:32400;
+        set $upstream_port 32400;
+        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/plex.subfolder.conf.sample b/plex.subfolder.conf.sample
index 7fbafc7..9953ba6 100644
--- a/plex.subfolder.conf.sample
+++ b/plex.subfolder.conf.sample
@@ -1,9 +1,9 @@
 #******** This config no longer works as intended. The web app loads, but no direct connection to server is made. *********
 #******** PRs welcome for anyone who figures out how to fix it. Use the subdomain config in the meantime. *******
 
-# plex does not require a base url setting
-# if plex is running in bridge mode, the below config should work as is.
-# for host mode, replace the line "proxy_pass http://$upstream_app:32400;" with "proxy_pass http://HOSTIP:32400;" HOSTIP being the IP address of plex
+# if plex is running in bridge mode and the container is named "plex", the below config should work as is
+# if not, replace the line "set $upstream_app plex;" with "set $upstream_app <containername>;"
+# or "set $upstream_app <HOSTIP>;" for host mode, HOSTIP being the IP address of plex
 # in plex server settings, under network, fill in "Custom server access URLs" with your domain (ie. "https://yourdomain.url:443/plex")
 
 location /plex {
@@ -21,8 +21,11 @@ location ^~ /plex/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app plex;
+    set $upstream_port 32400;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /plex(.*) $1 break;
-    proxy_pass http://$upstream_app:32400;
 
     proxy_set_header X-Plex-Client-Identifier $http_x_plex_client_identifier;
     proxy_set_header X-Plex-Device $http_x_plex_device;
diff --git a/plexwebtools.subdomain.conf.sample b/plexwebtools.subdomain.conf.sample
index c740c46..247f152 100644
--- a/plexwebtools.subdomain.conf.sample
+++ b/plexwebtools.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app plex;
-        proxy_pass http://$upstream_app:33400;
+        set $upstream_port 33400;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/plexwebtools.subfolder.conf.sample b/plexwebtools.subfolder.conf.sample
index 08da7c3..7c880dd 100644
--- a/plexwebtools.subfolder.conf.sample
+++ b/plexwebtools.subfolder.conf.sample
@@ -15,5 +15,8 @@ location ^~ /plexwebtools/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app plex;
-    proxy_pass http://$upstream_app:33400;
+    set $upstream_port 33400;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/portainer.subdomain.conf.sample b/portainer.subdomain.conf.sample
index 93d354c..4b9ca34 100644
--- a/portainer.subdomain.conf.sample
+++ b/portainer.subdomain.conf.sample
@@ -24,7 +24,10 @@ server {
 
         resolver 127.0.0.11 valid=30s;
         set $upstream_app portainer;
-        proxy_pass http://$upstream_app:9000;
+        set $upstream_port 9000;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_set_header Connection "";
         proxy_http_version 1.1;
         proxy_hide_header X-Frame-Options; # Possibly nott needed after Portainer 1.20.0
@@ -41,7 +44,10 @@ server {
 
         resolver 127.0.0.11 valid=30s;
         set $upstream_app portainer;
-        proxy_pass http://$upstream_app:9000;
+        set $upstream_port 9000;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
         proxy_http_version 1.1;
diff --git a/portainer.subfolder.conf.sample b/portainer.subfolder.conf.sample
index bbfbd81..00adcd4 100644
--- a/portainer.subfolder.conf.sample
+++ b/portainer.subfolder.conf.sample
@@ -15,8 +15,11 @@ location ^~ /portainer/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app portainer;
+    set $upstream_port 9000;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /portainer(.*) $1 break;
-    proxy_pass http://$upstream_app:9000;
     proxy_hide_header X-Frame-Options; # Possibly nott needed after Portainer 1.20.0
 }
 
@@ -24,8 +27,11 @@ location ^~ /portainer/api/websocket/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app portainer;
+    set $upstream_port 9000;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /portainer(.*) $1 break;
-    proxy_pass http://$upstream_app:9000;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "upgrade";
     proxy_hide_header X-Frame-Options; # Possibly nott needed after Portainer 1.20.0
diff --git a/prometheus.subdomain.conf.sample b/prometheus.subdomain.conf.sample
index 8f856a9..b93b816 100644
--- a/prometheus.subdomain.conf.sample
+++ b/prometheus.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app prometheus;
-        proxy_pass http://$upstream_app:9090;
+        set $upstream_port 9090;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/pydio.subdomain.conf.sample b/pydio.subdomain.conf.sample
index c780ba3..97617f2 100644
--- a/pydio.subdomain.conf.sample
+++ b/pydio.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app pydio;
-        proxy_pass https://$upstream_app:443;
+        set $upstream_port 443;
+        set $upstream_proto https;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/pyload.subdomain.conf.sample b/pyload.subdomain.conf.sample
index 3fdfc4a..4822cd7 100644
--- a/pyload.subdomain.conf.sample
+++ b/pyload.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app pyload;
-        proxy_pass http://$upstream_app:8000;
+        set $upstream_port 8000;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/qbittorrent.subdomain.conf.sample b/qbittorrent.subdomain.conf.sample
index cad5eaa..da5f79f 100644
--- a/qbittorrent.subdomain.conf.sample
+++ b/qbittorrent.subdomain.conf.sample
@@ -25,7 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app qbittorrent;
-        proxy_pass http://$upstream_app:8080;
+        set $upstream_port 8080;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
         proxy_set_header Referer '';
         proxy_set_header Host $upstream_app:8080;
@@ -35,8 +37,11 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app qbittorrent;
+        set $upstream_port 8080;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         rewrite /qbittorrent(.*) $1 break;
-        proxy_pass http://$upstream_app:8080;
 
         proxy_set_header Referer '';
         proxy_set_header Host $upstream_app:8080;
@@ -46,8 +51,11 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app qbittorrent;
+        set $upstream_port 8080;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         rewrite /qbittorrent(.*) $1 break;
-        proxy_pass http://$upstream_app:8080;
 
         proxy_set_header Referer '';
         proxy_set_header Host $upstream_app:8080;
@@ -57,8 +65,11 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app qbittorrent;
+        set $upstream_port 8080;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         rewrite /qbittorrent(.*) $1 break;
-        proxy_pass http://$upstream_app:8080;
 
         proxy_set_header Referer '';
         proxy_set_header Host $upstream_app:8080;
@@ -68,8 +79,11 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app qbittorrent;
+        set $upstream_port 8080;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         rewrite /qbittorrent(.*) $1 break;
-        proxy_pass http://$upstream_app:8080;
 
         proxy_set_header Referer '';
         proxy_set_header Host $upstream_app:8080;
@@ -79,8 +93,11 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app qbittorrent;
+        set $upstream_port 8080;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         rewrite /qbittorrent(.*) $1 break;
-        proxy_pass http://$upstream_app:8080;
 
         proxy_set_header Referer '';
         proxy_set_header Host $upstream_app:8080;
diff --git a/qbittorrent.subfolder.conf.sample b/qbittorrent.subfolder.conf.sample
index 1c97b02..7d56b98 100644
--- a/qbittorrent.subfolder.conf.sample
+++ b/qbittorrent.subfolder.conf.sample
@@ -15,8 +15,11 @@ location ^~ /qbittorrent/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app qbittorrent;
+    set $upstream_port 8080;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /qbittorrent(.*) $1 break;
-    proxy_pass http://$upstream_app:8080;
 
     proxy_set_header Referer '';
     proxy_set_header Host $upstream_app:8080;
@@ -26,8 +29,11 @@ location ^~ /qbittorrent/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app qbittorrent;
+    set $upstream_port 8080;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /qbittorrent(.*) $1 break;
-    proxy_pass http://$upstream_app:8080;
 
     proxy_set_header Referer '';
     proxy_set_header Host $upstream_app:8080;
@@ -37,8 +43,11 @@ location ^~ /qbittorrent/command {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app qbittorrent;
+    set $upstream_port 8080;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /qbittorrent(.*) $1 break;
-    proxy_pass http://$upstream_app:8080;
 
     proxy_set_header Referer '';
     proxy_set_header Host $upstream_app:8080;
@@ -48,8 +57,11 @@ location ^~ /qbittorrent/query {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app qbittorrent;
+    set $upstream_port 8080;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /qbittorrent(.*) $1 break;
-    proxy_pass http://$upstream_app:8080;
 
     proxy_set_header Referer '';
     proxy_set_header Host $upstream_app:8080;
@@ -59,8 +71,11 @@ location ^~ /qbittorrent/login {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app qbittorrent;
+    set $upstream_port 8080;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /qbittorrent(.*) $1 break;
-    proxy_pass http://$upstream_app:8080;
 
     proxy_set_header Referer '';
     proxy_set_header Host $upstream_app:8080;
@@ -70,8 +85,11 @@ location ^~ /qbittorrent/sync {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app qbittorrent;
+    set $upstream_port 8080;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /qbittorrent(.*) $1 break;
-    proxy_pass http://$upstream_app:8080;
 
     proxy_set_header Referer '';
     proxy_set_header Host $upstream_app:8080;
diff --git a/quassel-web.subdomain.conf.sample b/quassel-web.subdomain.conf.sample
index ff71b07..3358c07 100644
--- a/quassel-web.subdomain.conf.sample
+++ b/quassel-web.subdomain.conf.sample
@@ -1,4 +1,4 @@
-# make sure that your dns has a cname set for quassel and make sure Quassel-Web is running on http 
+# make sure that your dns has a cname set for quassel and make sure Quassel-Web is running on http
 # with -e 'HTTPS'='false' or if you're using -e 'ADVANCED'='true' by editing config.json appropriately
 
 server {
@@ -26,6 +26,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app quassel-web;
-        proxy_pass http://$upstream_app:64080;
+        set $upstream_port 64080;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/quassel-web.subfolder.conf.sample b/quassel-web.subfolder.conf.sample
index 95bc32f..cbe5891 100644
--- a/quassel-web.subfolder.conf.sample
+++ b/quassel-web.subfolder.conf.sample
@@ -1,4 +1,4 @@
-# Set base-url with docker run command env variable -e 'URL_BASE'='/quassel' and make sure Quassel-Web is running on http 
+# Set base-url with docker run command env variable -e 'URL_BASE'='/quassel' and make sure Quassel-Web is running on http
 # with -e 'HTTPS'='false' or if you're using -e 'ADVANCED'='true' by editing config.json appropriately
 
 location ^~ /quassel {
@@ -13,5 +13,8 @@ location ^~ /quassel {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app quassel-web;
-    proxy_pass http://$upstream_app:64080;
+    set $upstream_port 64080;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/radarr.subdomain.conf.sample b/radarr.subdomain.conf.sample
index 9d65e76..cccfccf 100644
--- a/radarr.subdomain.conf.sample
+++ b/radarr.subdomain.conf.sample
@@ -25,13 +25,19 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app radarr;
-        proxy_pass http://$upstream_app:7878;
+        set $upstream_port 7878;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location ~ (/radarr)?/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app radarr;
-        proxy_pass http://$upstream_app:7878;
+        set $upstream_port 7878;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/radarr.subfolder.conf.sample b/radarr.subfolder.conf.sample
index bd9073a..a2a3f88 100644
--- a/radarr.subfolder.conf.sample
+++ b/radarr.subfolder.conf.sample
@@ -12,12 +12,18 @@ location ^~ /radarr {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app radarr;
-    proxy_pass http://$upstream_app:7878;
+    set $upstream_port 7878;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
 
 location ^~ /radarr/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app radarr;
-    proxy_pass http://$upstream_app:7878;
+    set $upstream_port 7878;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/raneto.subdomain.conf.sample b/raneto.subdomain.conf.sample
index 0bf8a7c..945a6db 100644
--- a/raneto.subdomain.conf.sample
+++ b/raneto.subdomain.conf.sample
@@ -24,6 +24,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app raneto;
-        proxy_pass http://$upstream_app:3000;
+        set $upstream_port 3000;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
-}
\ No newline at end of file
+}
diff --git a/resilio-sync.subdomain.conf.sample b/resilio-sync.subdomain.conf.sample
index 89f7a1e..58fb60b 100644
--- a/resilio-sync.subdomain.conf.sample
+++ b/resilio-sync.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app resilio-sync;
-        proxy_pass http://$upstream_app:8888;
+        set $upstream_port 8888;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/rutorrent.subdomain.conf.sample b/rutorrent.subdomain.conf.sample
index 93caeb5..a8183ef 100644
--- a/rutorrent.subdomain.conf.sample
+++ b/rutorrent.subdomain.conf.sample
@@ -25,13 +25,19 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app rutorrent;
-        proxy_pass http://$upstream_app:80;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location /RPC2 {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app rutorrent;
-        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/rutorrent.subfolder.conf.sample b/rutorrent.subfolder.conf.sample
index 7ba3901..dd74886 100644
--- a/rutorrent.subfolder.conf.sample
+++ b/rutorrent.subfolder.conf.sample
@@ -15,14 +15,20 @@ location ^~ /rutorrent/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app rutorrent;
+    set $upstream_port 80;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /rutorrent(.*) $1 break;
-    proxy_pass http://$upstream_app:80;
 }
 
 location ^~ /rutorrent/RPC2 {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app rutorrent;
+    set $upstream_port 80;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /rutorrent(.*) $1 break;
-    proxy_pass http://$upstream_app:80;
 }
diff --git a/sabnzbd.subdomain.conf.sample b/sabnzbd.subdomain.conf.sample
index 38b7fd5..f6f6d9f 100644
--- a/sabnzbd.subdomain.conf.sample
+++ b/sabnzbd.subdomain.conf.sample
@@ -27,13 +27,19 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app sabnzbd;
-        proxy_pass http://$upstream_app:8080;
+        set $upstream_port 8080;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location ~ (/sabnzbd)?/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app sabnzbd;
-        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/sabnzbd.subfolder.conf.sample b/sabnzbd.subfolder.conf.sample
index 14cb9a8..d916a08 100644
--- a/sabnzbd.subfolder.conf.sample
+++ b/sabnzbd.subfolder.conf.sample
@@ -12,12 +12,18 @@ location ^~ /sabnzbd {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app sabnzbd;
-    proxy_pass http://$upstream_app:8080;
+    set $upstream_port 8080;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
 
 location ^~ /sabnzbd/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app sabnzbd;
-    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/scope.subfolder.conf.sample b/scope.subfolder.conf.sample
index 24fe4e6..853c361 100644
--- a/scope.subfolder.conf.sample
+++ b/scope.subfolder.conf.sample
@@ -15,8 +15,11 @@ location ^~ /scope/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app scope;
+    set $upstream_port 4040;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /scope(.*) $1 break;
-    proxy_pass http://$upstream_app:4040;
     proxy_set_header Upgrade $http_upgrade;
 	proxy_set_header Connection "upgrade";
-}
\ No newline at end of file
+}
diff --git a/sickrage.subdomain.conf.sample b/sickrage.subdomain.conf.sample
index d468ad7..3c6882f 100644
--- a/sickrage.subdomain.conf.sample
+++ b/sickrage.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app sickrage;
-        proxy_pass http://$upstream_app:8081;
+        set $upstream_port 8081;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/sickrage.subfolder.conf.sample b/sickrage.subfolder.conf.sample
index eecc90a..5f8ea3b 100644
--- a/sickrage.subfolder.conf.sample
+++ b/sickrage.subfolder.conf.sample
@@ -12,5 +12,8 @@ location ^~ /sickrage {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app sickrage;
-    proxy_pass http://$upstream_app:8081;
+    set $upstream_port 8081;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/smokeping.subdomain.conf.sample b/smokeping.subdomain.conf.sample
index d14659b..a3d642e 100644
--- a/smokeping.subdomain.conf.sample
+++ b/smokeping.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app smokeping;
-        proxy_pass http://$upstream_app;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/smokeping.subfolder.conf.sample b/smokeping.subfolder.conf.sample
index 3ff68aa..f265640 100644
--- a/smokeping.subfolder.conf.sample
+++ b/smokeping.subfolder.conf.sample
@@ -12,5 +12,8 @@ location ^~ /smokeping {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app smokeping;
-    proxy_pass http://$upstream_app;
+    set $upstream_port 80;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/sonarr.subdomain.conf.sample b/sonarr.subdomain.conf.sample
index 7800209..5ff6e37 100644
--- a/sonarr.subdomain.conf.sample
+++ b/sonarr.subdomain.conf.sample
@@ -25,13 +25,19 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app sonarr;
-        proxy_pass http://$upstream_app:8989;
+        set $upstream_port 8989;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location ~ (/sonarr)?/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app sonarr;
-        proxy_pass http://$upstream_app:8989;
+        set $upstream_port 8989;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
    }
 }
diff --git a/sonarr.subfolder.conf.sample b/sonarr.subfolder.conf.sample
index 30cc50a..3f34059 100644
--- a/sonarr.subfolder.conf.sample
+++ b/sonarr.subfolder.conf.sample
@@ -12,12 +12,18 @@ location ^~ /sonarr {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app sonarr;
-    proxy_pass http://$upstream_app:8989;
+    set $upstream_port 8989;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
 
 location ^~ /sonarr/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app sonarr;
-    proxy_pass http://$upstream_app:8989;
+    set $upstream_port 8989;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/statping.subdomain.conf.sample b/statping.subdomain.conf.sample
index 43a4280..1e99282 100644
--- a/statping.subdomain.conf.sample
+++ b/statping.subdomain.conf.sample
@@ -27,6 +27,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app statup;
-        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/syncthing.subdomain.conf.sample b/syncthing.subdomain.conf.sample
index ba80702..a674ff6 100644
--- a/syncthing.subdomain.conf.sample
+++ b/syncthing.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app syncthing;
-        proxy_pass http://$upstream_app:8384;
+        set $upstream_port 8384;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/taisun.subdomain.conf.sample b/taisun.subdomain.conf.sample
index 7e1b51c..5836787 100644
--- a/taisun.subdomain.conf.sample
+++ b/taisun.subdomain.conf.sample
@@ -25,7 +25,10 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app taisun;
-        proxy_pass http://$upstream_app:3000;
+        set $upstream_port 3000;
+        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/tautulli.subdomain.conf.sample b/tautulli.subdomain.conf.sample
index 0b15912..ff5efcf 100644
--- a/tautulli.subdomain.conf.sample
+++ b/tautulli.subdomain.conf.sample
@@ -25,13 +25,19 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app tautulli;
-        proxy_pass http://$upstream_app:8181;
+        set $upstream_port 8181;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location ~ (/tautulli)?/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app tautulli;
-        proxy_pass http://$upstream_app:8181;
+        set $upstream_port 8181;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/tautulli.subfolder.conf.sample b/tautulli.subfolder.conf.sample
index 814ed08..6a70ef5 100644
--- a/tautulli.subfolder.conf.sample
+++ b/tautulli.subfolder.conf.sample
@@ -12,12 +12,18 @@ location ^~ /tautulli {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app tautulli;
-    proxy_pass http://$upstream_app:8181;
+    set $upstream_port 8181;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
 
 location ^~ /tautulli/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app tautulli;
-    proxy_pass http://$upstream_app:8181;
+    set $upstream_port 8181;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/tdarr.subdomain.conf.sample b/tdarr.subdomain.conf.sample
index d22aa71..806801d 100644
--- a/tdarr.subdomain.conf.sample
+++ b/tdarr.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app tdarr;
-        proxy_pass http://$upstream_app:8265;
+        set $upstream_port 8265;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/thelounge.subdomain.conf.sample b/thelounge.subdomain.conf.sample
index e3dbf89..9eb9578 100644
--- a/thelounge.subdomain.conf.sample
+++ b/thelounge.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app thelounge;
-        proxy_pass http://$upstream_app:9000;
+        set $upstream_port 9000;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/thelounge.subfolder.conf.sample b/thelounge.subfolder.conf.sample
index b1c048a..a3b663d 100644
--- a/thelounge.subfolder.conf.sample
+++ b/thelounge.subfolder.conf.sample
@@ -15,6 +15,9 @@ location ^~ /thelounge/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app thelounge;
+    set $upstream_port 9000;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     rewrite /thelounge(.*) $1 break;
-    proxy_pass http://$upstream_app:9000;
 }
diff --git a/transmission.subdomain.conf.sample b/transmission.subdomain.conf.sample
index 7839550..54cd511 100644
--- a/transmission.subdomain.conf.sample
+++ b/transmission.subdomain.conf.sample
@@ -25,14 +25,20 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app transmission;
+        set $upstream_port 9091;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_pass_header  X-Transmission-Session-Id;
-        proxy_pass http://$upstream_app:9091;
     }
 
     location ~ (/transmission)?/rpc {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app transmission;
-        proxy_pass http://$upstream_app:9091;
+        set $upstream_port 9091;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/transmission.subfolder.conf.sample b/transmission.subfolder.conf.sample
index 1c1ab28..468d4a0 100644
--- a/transmission.subfolder.conf.sample
+++ b/transmission.subfolder.conf.sample
@@ -12,13 +12,19 @@ location ^~ /transmission {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app transmission;
+    set $upstream_port 9091;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     proxy_pass_header  X-Transmission-Session-Id;
-    proxy_pass http://$upstream_app:9091;
 }
 
 location ^~ /transmission/rpc {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app transmission;
-    proxy_pass http://$upstream_app:9091;
+    set $upstream_port 9091;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
 }
diff --git a/tt-rss.subdomain.conf.sample b/tt-rss.subdomain.conf.sample
index 9d6ab36..2d8072e 100644
--- a/tt-rss.subdomain.conf.sample
+++ b/tt-rss.subdomain.conf.sample
@@ -22,10 +22,13 @@ server {
         # enable the next two lines for ldap auth
         #auth_request /auth;
         #error_page 401 =200 /login;
-        
+
         resolver 127.0.0.11 valid=30s;
         set $upstream_app tt-rss;
-        proxy_pass http://$upstream_app:80;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_redirect  http://$upstream_app:80 /;
         proxy_read_timeout 60s;
         proxy_set_header          Host            $host;
diff --git a/ubooquity.subdomain.conf.sample b/ubooquity.subdomain.conf.sample
index caf91a0..51b2a13 100644
--- a/ubooquity.subdomain.conf.sample
+++ b/ubooquity.subdomain.conf.sample
@@ -21,31 +21,43 @@ 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 ubooquity;
-        proxy_pass http://$upstream_app:2202;
+        set $upstream_port 2202;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location /admin {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app ubooquity;
-        proxy_pass http://$upstream_app:2203;
+        set $upstream_port 2203;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location /admin-res {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app ubooquity;
-        proxy_pass http://$upstream_app:2203;
+        set $upstream_port 2203;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location /admin-api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app ubooquity;
-        proxy_pass http://$upstream_app:2203;
+        set $upstream_port 2203;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/ubooquity.subfolder.conf.sample b/ubooquity.subfolder.conf.sample
index 84ef84e..fb0d76c 100644
--- a/ubooquity.subfolder.conf.sample
+++ b/ubooquity.subfolder.conf.sample
@@ -12,12 +12,18 @@
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app ubooquity;
-        proxy_pass http://$upstream_app:2202;
+        set $upstream_port 2202;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location ^~ /ubooquity/admin {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app ubooquity;
-        proxy_pass http://$upstream_app:2203;
+        set $upstream_port 2203;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
diff --git a/unifi-controller.subdomain.conf.sample b/unifi-controller.subdomain.conf.sample
index 18b7c40..0ba727d 100644
--- a/unifi-controller.subdomain.conf.sample
+++ b/unifi-controller.subdomain.conf.sample
@@ -25,7 +25,10 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app unifi-controller;
-        proxy_pass https://$upstream_app:8443;
+        set $upstream_port 8443;
+        set $upstream_proto https;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location /wss {
@@ -40,7 +43,10 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app unifi-controller;
-        proxy_pass https://$upstream_app:8443;
+        set $upstream_port 8443;
+        set $upstream_proto https;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
         proxy_buffering off;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "Upgrade";
diff --git a/znc.subdomain.conf.sample b/znc.subdomain.conf.sample
index 5650291..3ab36f5 100644
--- a/znc.subdomain.conf.sample
+++ b/znc.subdomain.conf.sample
@@ -25,6 +25,9 @@ server {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app znc;
-        proxy_pass http://$upstream_app:6501;
+        set $upstream_port 6501;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
-}
\ No newline at end of file
+}
diff --git a/znc.subfolder.conf.sample b/znc.subfolder.conf.sample
index decf3ef..5c7b47b 100644
--- a/znc.subfolder.conf.sample
+++ b/znc.subfolder.conf.sample
@@ -12,5 +12,8 @@ location /znc {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app znc;
-    proxy_pass http://$upstream_app:6501;
-}
\ No newline at end of file
+    set $upstream_port 6501;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+}

From 7f83edf5492eb6c7e4175409beeea32e6c41281d Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Thu, 20 Feb 2020 21:57:00 -0600
Subject: [PATCH 056/126] Fix jackett api locations

---
 jackett.subdomain.conf.sample | 12 +++++++++++-
 jackett.subfolder.conf.sample | 14 ++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/jackett.subdomain.conf.sample b/jackett.subdomain.conf.sample
index a51fe08..69b4ecd 100644
--- a/jackett.subdomain.conf.sample
+++ b/jackett.subdomain.conf.sample
@@ -31,7 +31,17 @@ server {
 
     }
 
-    location ~ (/jackett)?/(api|dl) {
+    location ~ (/jackett)?/api {
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_app jackett;
+        set $upstream_port 9117;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+    }
+
+    location ~ (/jackett)?/dl {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app jackett;
diff --git a/jackett.subfolder.conf.sample b/jackett.subfolder.conf.sample
index 7e04001..f67020e 100644
--- a/jackett.subfolder.conf.sample
+++ b/jackett.subfolder.conf.sample
@@ -1,6 +1,6 @@
 # first go into jackett settings, set the URL Base to /jackett and restart the jackett container
 
-location /jackett {
+location ^~ /jackett {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
     #auth_basic_user_file /config/nginx/.htpasswd;
@@ -18,7 +18,17 @@ location /jackett {
 
 }
 
-location ~ /jackett/(api|dl) {
+location ^~ /jackett/api {
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_app jackett;
+    set $upstream_port 9117;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+}
+
+location ^~ /jackett/dl {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app jackett;

From 3d6e33bb76ce07dbbee8933f8fa0d2c3f3a22278 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Thu, 20 Feb 2020 22:04:21 -0600
Subject: [PATCH 057/126] Fix qbittorrent subdomain api locations

---
 qbittorrent.subdomain.conf.sample | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/qbittorrent.subdomain.conf.sample b/qbittorrent.subdomain.conf.sample
index da5f79f..dc49215 100644
--- a/qbittorrent.subdomain.conf.sample
+++ b/qbittorrent.subdomain.conf.sample
@@ -33,7 +33,7 @@ server {
         proxy_set_header Host $upstream_app:8080;
     }
 
-    location ^~ /qbittorrent/api {
+    location ~ (/qbittorrent)?/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app qbittorrent;
@@ -47,7 +47,7 @@ server {
         proxy_set_header Host $upstream_app:8080;
     }
 
-    location ^~ /qbittorrent/command {
+    location ~ (/qbittorrent)?/command {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app qbittorrent;
@@ -61,7 +61,7 @@ server {
         proxy_set_header Host $upstream_app:8080;
     }
 
-    location ^~ /qbittorrent/query {
+    location ~ (/qbittorrent)?/query {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app qbittorrent;
@@ -75,7 +75,7 @@ server {
         proxy_set_header Host $upstream_app:8080;
     }
 
-    location ^~ /qbittorrent/login {
+    location ~ (/qbittorrent)?/login {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app qbittorrent;
@@ -89,7 +89,7 @@ server {
         proxy_set_header Host $upstream_app:8080;
     }
 
-    location ^~ /qbittorrent/sync {
+    location ~ (/qbittorrent)?/sync {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app qbittorrent;

From ec0217501244e7293d18741117dfeb918ca5b820 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Tue, 25 Feb 2020 10:08:53 -0500
Subject: [PATCH 058/126] Create pydio-cells.subdomain.conf.sample

---
 pydio-cells.subdomain.conf.sample | 54 +++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 pydio-cells.subdomain.conf.sample

diff --git a/pydio-cells.subdomain.conf.sample b/pydio-cells.subdomain.conf.sample
new file mode 100644
index 0000000..99b6171
--- /dev/null
+++ b/pydio-cells.subdomain.conf.sample
@@ -0,0 +1,54 @@
+# make sure that your dns has a cname set for pydio-cells
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name pydio-cells.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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 pydio-cells;
+        set $upstream_port 8080;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+    }
+
+    location /ws {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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 pydio-cells;
+        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 "upgrade";
+    }
+
+}

From 152a846611e599943a47741d4441b5c604b2ebe8 Mon Sep 17 00:00:00 2001
From: Dan Opitz <danny.a.opitz@gmail.com>
Date: Thu, 27 Feb 2020 15:43:54 -0600
Subject: [PATCH 059/126] Adding BookStack Subdomain Config

---
 bookstack.subdomain.conf.sample | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 bookstack.subdomain.conf.sample

diff --git a/bookstack.subdomain.conf.sample b/bookstack.subdomain.conf.sample
new file mode 100644
index 0000000..6c4fbe0
--- /dev/null
+++ b/bookstack.subdomain.conf.sample
@@ -0,0 +1,28 @@
+# Ensure you have the APP_URL Environment Variable set correctly in your Docker Run/Compose or in BookStack Env File (/www/.env)
+# https://github.com/linuxserver/docker-bookstack#docker
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name bookstack.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    location / {
+        #enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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_bookstack bookstack;
+        proxy_pass http://$upstream_bookstack:80;
+    }   
+}

From 10cd245336d60b589465eb9aa3c430e1863020a9 Mon Sep 17 00:00:00 2001
From: Dan Opitz <danny.a.opitz@gmail.com>
Date: Thu, 27 Feb 2020 17:10:31 -0600
Subject: [PATCH 060/126] Changing to proto, app, port format

---
 bookstack.subdomain.conf.sample | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bookstack.subdomain.conf.sample b/bookstack.subdomain.conf.sample
index 6c4fbe0..0bba432 100644
--- a/bookstack.subdomain.conf.sample
+++ b/bookstack.subdomain.conf.sample
@@ -1,3 +1,4 @@
+# make sure that your dns has a cname set for bookstack and that your bookstack container is named bookstack
 # Ensure you have the APP_URL Environment Variable set correctly in your Docker Run/Compose or in BookStack Env File (/www/.env)
 # https://github.com/linuxserver/docker-bookstack#docker
 
@@ -22,7 +23,10 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_bookstack bookstack;
-        proxy_pass http://$upstream_bookstack:80;
+        set $upstream_app bookstack;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }   
 }

From 0d9b0c19bd34770bdd894c37647a5b04ae6e6841 Mon Sep 17 00:00:00 2001
From: MagicalCodeMonkey <mwoodru@gmail.com>
Date: Sun, 1 Mar 2020 21:24:59 -0500
Subject: [PATCH 061/126] Initial commit for SyncLounge subfolder confs

---
 synclounge-server.subfolder.conf.sample | 29 +++++++++++++++++++++++++
 synclounge.subfolder.conf.sample        | 29 +++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 synclounge-server.subfolder.conf.sample
 create mode 100644 synclounge.subfolder.conf.sample

diff --git a/synclounge-server.subfolder.conf.sample b/synclounge-server.subfolder.conf.sample
new file mode 100644
index 0000000..30f9138
--- /dev/null
+++ b/synclounge-server.subfolder.conf.sample
@@ -0,0 +1,29 @@
+#******** Due to some bugs in SyncLounge, this config may conflict with others. *********
+
+# SyncLounge defaults the server to `slserver` already
+location /slserver {
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_app synclounge;
+    set $upstream_port 8089;
+    set $upstream_proto http;
+
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+}
+
+# Due to a bug in SyncLounge, some websockets calls don't respect the base url (server root) setting
+# TODO: Update when fixed
+location /socket.io {
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_app synclounge;
+    set $upstream_port 8089;
+    set $upstream_proto http;
+
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port/slserver/socket.io/;
+}
\ No newline at end of file
diff --git a/synclounge.subfolder.conf.sample b/synclounge.subfolder.conf.sample
new file mode 100644
index 0000000..bc433ae
--- /dev/null
+++ b/synclounge.subfolder.conf.sample
@@ -0,0 +1,29 @@
+#******** Due to some bugs in SyncLounge, this config may conflict with others. *********
+
+# Set `webroot` to `slweb` and restart the container
+location /slweb {
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_app synclounge;
+    set $upstream_port 8088;
+    set $upstream_proto http;
+
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+}
+
+# Due to a bug in SyncLounge, some requests like /config don't respect the web's base url setting (webroot)
+# TODO: Update when fixed
+location /config {
+    return 301 $scheme://$host/slweb$request_uri;
+}
+
+# Invite links need to be rewritten to use the web's base url setting (webroot)
+# The docker container currently sets `autoJoinUrl` ENV variable on build to `http://${DOMAIN}`
+# overriding what the user has set.
+# TODO: Update when fixed
+location /invite/ {
+    return 301 $scheme://$host/slweb$request_uri;
+}
\ No newline at end of file

From 5669288139df6d1edc130992f89f993cb28e701d Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Mon, 2 Mar 2020 20:32:36 -0500
Subject: [PATCH 062/126] Create documentserver.subdomain.conf.sample

---
 documentserver.subdomain.conf.sample | 37 ++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 documentserver.subdomain.conf.sample

diff --git a/documentserver.subdomain.conf.sample b/documentserver.subdomain.conf.sample
new file mode 100644
index 0000000..6d80844
--- /dev/null
+++ b/documentserver.subdomain.conf.sample
@@ -0,0 +1,37 @@
+# Make sure that your dns has a cname set for onlyoffice named "documentserver"
+# Make sure that the onlyoffice documentserver container is named "documentserver"
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name documentserver.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    #enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        #enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        #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 documentserver;
+        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;
+
+    }
+}

From 3fb6dbcb8860285a0641e2fe95d8c794265f72d5 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Thu, 5 Mar 2020 08:45:15 -0600
Subject: [PATCH 063/126] Add SyncLounge subdomain configs (#136)

* Initial commit for SyncLounge proxy confs

* Fix formatting and change one comment

* Delete server conf since the other will work fine
---
 synclounge.subdomain.conf.sample | 70 ++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 synclounge.subdomain.conf.sample

diff --git a/synclounge.subdomain.conf.sample b/synclounge.subdomain.conf.sample
new file mode 100644
index 0000000..f55dbf1
--- /dev/null
+++ b/synclounge.subdomain.conf.sample
@@ -0,0 +1,70 @@
+# Use this if you are using the `latest` or `alpine` tags for the container, which contains both the web client and server applications.
+# Make sure that your dns has a cname set for synclounge
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name synclounge.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+    proxy_redirect off;
+    proxy_buffering off;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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 synclounge;
+        set $upstream_port 8088;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+    }
+
+    ###
+    # Server
+    ###
+
+    # Change `/slserver` to what you set your server root to, if you change it.
+    location /slserver {
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_app synclounge;
+        set $upstream_port 8089;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+    }
+
+    # Due to a bug in SyncLounge, some websockets calls don't respect the base url (server root) setting
+    # TODO: Update when fixed
+    location /socket.io {
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_app synclounge;
+        set $upstream_port 8089;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port/slserver/socket.io/;
+
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+
+    }
+}

From dda295e22960f8fc2559d39d0c0c60a6668ddeb9 Mon Sep 17 00:00:00 2001
From: driz <40674481+drizuid@users.noreply.github.com>
Date: Thu, 5 Mar 2020 21:01:54 -0500
Subject: [PATCH 064/126] Create netboot.subdomain.conf.sample

---
 netboot.subdomain.conf.sample | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 netboot.subdomain.conf.sample

diff --git a/netboot.subdomain.conf.sample b/netboot.subdomain.conf.sample
new file mode 100644
index 0000000..bcc5a2d
--- /dev/null
+++ b/netboot.subdomain.conf.sample
@@ -0,0 +1,33 @@
+# make sure that your dns has a cname set for netboot
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name netboot.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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 netboot;
+        set $upstream_port 3000;
+        set $upstream_proto http;
+        set $upstream_netboot netboot;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+    }
+}

From 5b386216e3304c9574367313d0312182a64faad7 Mon Sep 17 00:00:00 2001
From: driz <40674481+drizuid@users.noreply.github.com>
Date: Sat, 7 Mar 2020 10:28:57 -0500
Subject: [PATCH 065/126] Update netboot.subdomain.conf.sample

left remnant of original config in, had to remove
---
 netboot.subdomain.conf.sample | 1 -
 1 file changed, 1 deletion(-)

diff --git a/netboot.subdomain.conf.sample b/netboot.subdomain.conf.sample
index bcc5a2d..19b5d7b 100644
--- a/netboot.subdomain.conf.sample
+++ b/netboot.subdomain.conf.sample
@@ -27,7 +27,6 @@ server {
         set $upstream_app netboot;
         set $upstream_port 3000;
         set $upstream_proto http;
-        set $upstream_netboot netboot;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
     }
 }

From 08299a1e80c444b4938b8c4a9125789c457d1b37 Mon Sep 17 00:00:00 2001
From: nemchik <eric@nemchik.com>
Date: Fri, 13 Mar 2020 09:14:13 -0500
Subject: [PATCH 066/126] Fix upstream auth vars

---
 organizr-auth.subfolder.conf.sample | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/organizr-auth.subfolder.conf.sample b/organizr-auth.subfolder.conf.sample
index b8c358d..bbc57d5 100644
--- a/organizr-auth.subfolder.conf.sample
+++ b/organizr-auth.subfolder.conf.sample
@@ -17,10 +17,10 @@ location ~ /auth-([0-9]+) {
     internal;
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_app organizr;
-    set $upstream_port 80;
-    set $upstream_proto http;
-    proxy_pass $upstream_proto://$upstream_app:$upstream_port/api/?v1/auth&group=$1;
+    set $upstream_auth_app organizr;
+    set $upstream_auth_port 80;
+    set $upstream_auth_proto http;
+    proxy_pass $upstream_auth_proto://$upstream_auth_app:$upstream_auth_port/api/?v1/auth&group=$1;
     proxy_set_header Content-Length "";
 
     # Do not uncomment the lines below, these are examples for usue in other proxy configs

From 0d9326f2a9a7b06ec88b6c96d7458c514507e2ea Mon Sep 17 00:00:00 2001
From: MagicalCodeMonkey <mwoodru@gmail.com>
Date: Wed, 18 Mar 2020 12:02:20 -0400
Subject: [PATCH 067/126] Update to working subfolder conf

---
 synclounge.subfolder.conf.sample | 45 ++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/synclounge.subfolder.conf.sample b/synclounge.subfolder.conf.sample
index bc433ae..4912da3 100644
--- a/synclounge.subfolder.conf.sample
+++ b/synclounge.subfolder.conf.sample
@@ -1,6 +1,12 @@
-#******** Due to some bugs in SyncLounge, this config may conflict with others. *********
+# Use this if you are using the `latest` or `alpine` tags for the container, which contains both the web client and server applications.
+# Make sure that you have set the web base url (webroot/WEB_ROOT setting) to '/slweb' or change all occurrences of `/slweb` below to match your settings.
+# The server base url (serverroot/SERVER_ROOT) defaults to '/slserver'. If you change this setting, change all occurrences of '/slserver' below
 
-# Set `webroot` to `slweb` and restart the container
+###
+# Client
+###
+
+# Due to a bug in SyncLounge, some requests like /config don't respect the base url (web root) setting
 location /slweb {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
@@ -13,17 +19,28 @@ location /slweb {
 
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 }
-
-# Due to a bug in SyncLounge, some requests like /config don't respect the web's base url setting (webroot)
-# TODO: Update when fixed
-location /config {
-    return 301 $scheme://$host/slweb$request_uri;
+if ($http_referer ~* /slweb) {
+    rewrite ^/config /slweb/config redirect;
+    rewrite ^/socket.io/(.*) /slserver/socket.io/$1? redirect;
 }
 
-# Invite links need to be rewritten to use the web's base url setting (webroot)
-# The docker container currently sets `autoJoinUrl` ENV variable on build to `http://${DOMAIN}`
-# overriding what the user has set.
-# TODO: Update when fixed
-location /invite/ {
-    return 301 $scheme://$host/slweb$request_uri;
-}
\ No newline at end of file
+###
+# Server
+###
+
+# Proxy for the server
+location /slserver {
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_app synclounge;
+    set $upstream_port 8089;
+    set $upstream_proto http;
+
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "upgrade";
+
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+}
+if ($http_referer ~* /slserver) {
+    rewrite ^/socket.io/(.*) /slserver/socket.io/$1? redirect;
+}

From bd690de36e1fff51cc4fd3a09e32cd8dcc2a73eb Mon Sep 17 00:00:00 2001
From: MagicalCodeMonkey <mwoodru@gmail.com>
Date: Sat, 21 Mar 2020 23:49:46 -0400
Subject: [PATCH 068/126] Remove unneeded file

---
 synclounge-server.subfolder.conf.sample | 29 -------------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 synclounge-server.subfolder.conf.sample

diff --git a/synclounge-server.subfolder.conf.sample b/synclounge-server.subfolder.conf.sample
deleted file mode 100644
index 30f9138..0000000
--- a/synclounge-server.subfolder.conf.sample
+++ /dev/null
@@ -1,29 +0,0 @@
-#******** Due to some bugs in SyncLounge, this config may conflict with others. *********
-
-# SyncLounge defaults the server to `slserver` already
-location /slserver {
-    include /config/nginx/proxy.conf;
-    resolver 127.0.0.11 valid=30s;
-    set $upstream_app synclounge;
-    set $upstream_port 8089;
-    set $upstream_proto http;
-
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-
-    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
-}
-
-# Due to a bug in SyncLounge, some websockets calls don't respect the base url (server root) setting
-# TODO: Update when fixed
-location /socket.io {
-    resolver 127.0.0.11 valid=30s;
-    set $upstream_app synclounge;
-    set $upstream_port 8089;
-    set $upstream_proto http;
-
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-
-    proxy_pass $upstream_proto://$upstream_app:$upstream_port/slserver/socket.io/;
-}
\ No newline at end of file

From 4866ef294eaef61735b5d216947673baba35904f Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Sun, 22 Mar 2020 13:39:28 -0400
Subject: [PATCH 069/126] Add Boinc and Folding@home subdomain confs (#140)

* Create boinc.subdomain.conf

* Create foldingathome.subdomain.conf

* Rename boinc.subdomain.conf to boinc.subdomain.conf.sample

* Rename foldingathome.subdomain.conf to foldingathome.subdomain.conf.sample
---
 boinc.subdomain.conf.sample         | 34 +++++++++++++++++++++++++++++
 foldingathome.subdomain.conf.sample | 34 +++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 boinc.subdomain.conf.sample
 create mode 100644 foldingathome.subdomain.conf.sample

diff --git a/boinc.subdomain.conf.sample b/boinc.subdomain.conf.sample
new file mode 100644
index 0000000..8be90cd
--- /dev/null
+++ b/boinc.subdomain.conf.sample
@@ -0,0 +1,34 @@
+# make sure that your dns has a cname set for boinc
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name boinc.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # enable the next two lines for ldap auth
+        #auth_request /auth;
+        #error_page 401 =200 /login;
+
+        include /config/nginx/proxy.conf;
+        proxy_buffering off;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_app boinc;
+        set $upstream_port 8080;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+    }
+}
diff --git a/foldingathome.subdomain.conf.sample b/foldingathome.subdomain.conf.sample
new file mode 100644
index 0000000..fba1b6d
--- /dev/null
+++ b/foldingathome.subdomain.conf.sample
@@ -0,0 +1,34 @@
+# make sure that your dns has a cname set for foldingathome
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name foldingathome.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # enable the next two lines for ldap auth
+        #auth_request /auth;
+        #error_page 401 =200 /login;
+
+        include /config/nginx/proxy.conf;
+        proxy_buffering off;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_app foldingathome;
+        set $upstream_port 7396;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+    }
+}

From 55592fa4e1985f016e6e0c3bcd4fd92e55a7c359 Mon Sep 17 00:00:00 2001
From: MagicalCodeMonkey <mwoodru@gmail.com>
Date: Sun, 22 Mar 2020 15:38:07 -0400
Subject: [PATCH 070/126] Add auth comments

---
 synclounge.subfolder.conf.sample | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/synclounge.subfolder.conf.sample b/synclounge.subfolder.conf.sample
index 4912da3..8afe577 100644
--- a/synclounge.subfolder.conf.sample
+++ b/synclounge.subfolder.conf.sample
@@ -8,6 +8,14 @@
 
 # Due to a bug in SyncLounge, some requests like /config don't respect the base url (web root) setting
 location /slweb {
+    # enable the next two lines for http auth
+    #auth_basic "Restricted";
+    #auth_basic_user_file /config/nginx/.htpasswd;
+
+    # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
+    #auth_request /auth;
+    #error_page 401 =200 /login;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app synclounge;

From a95f4f355efb3f6008c6c24a6fb8c10cf82ec450 Mon Sep 17 00:00:00 2001
From: MagicalCodeMonkey <mwoodru@gmail.com>
Date: Sun, 22 Mar 2020 16:06:25 -0400
Subject: [PATCH 071/126] Update comments

---
 synclounge.subfolder.conf.sample | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/synclounge.subfolder.conf.sample b/synclounge.subfolder.conf.sample
index 8afe577..61ddbbd 100644
--- a/synclounge.subfolder.conf.sample
+++ b/synclounge.subfolder.conf.sample
@@ -6,7 +6,6 @@
 # Client
 ###
 
-# Due to a bug in SyncLounge, some requests like /config don't respect the base url (web root) setting
 location /slweb {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
@@ -28,7 +27,9 @@ location /slweb {
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 }
 if ($http_referer ~* /slweb) {
+    # Due to a bug in SyncLounge, some requests like /config don't respect the base url (web root) setting
     rewrite ^/config /slweb/config redirect;
+    # I think this is a bug as well
     rewrite ^/socket.io/(.*) /slserver/socket.io/$1? redirect;
 }
 
@@ -50,5 +51,6 @@ location /slserver {
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 }
 if ($http_referer ~* /slserver) {
+    # Due to a bug in SyncLounge, some requests like socket.io don't respect the base url (server root) setting
     rewrite ^/socket.io/(.*) /slserver/socket.io/$1? redirect;
 }

From 19b101cafddaec01c03052b81ef65e99c3163e70 Mon Sep 17 00:00:00 2001
From: HalianElf <28244771+HalianElf@users.noreply.github.com>
Date: Sun, 22 Mar 2020 22:27:50 -0400
Subject: [PATCH 072/126] Fix for 404 and PHP errors

---
 organizr.subfolder.conf.sample | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/organizr.subfolder.conf.sample b/organizr.subfolder.conf.sample
index aae5aff..9acaee0 100644
--- a/organizr.subfolder.conf.sample
+++ b/organizr.subfolder.conf.sample
@@ -1,6 +1,6 @@
 # In order to use this location block you need to edit the default file one folder up and comment out the / location
 
-location / {
+location ^~ / {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
     #auth_basic_user_file /config/nginx/.htpasswd;
@@ -10,6 +10,7 @@ location / {
     #error_page 401 =200 /login;
 
     include /config/nginx/proxy.conf;
+    proxy_intercept_errors on;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app organizr;
     set $upstream_port 80;

From 05ee1f3bba6bbeb370d75a85b743f6bbcd4786a1 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Mon, 23 Mar 2020 15:14:28 -0500
Subject: [PATCH 073/126] Update synclounge.subfolder.conf.sample

Reordering to keep in line with existing proxies
---
 synclounge.subfolder.conf.sample | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/synclounge.subfolder.conf.sample b/synclounge.subfolder.conf.sample
index 61ddbbd..07b3ccc 100644
--- a/synclounge.subfolder.conf.sample
+++ b/synclounge.subfolder.conf.sample
@@ -20,11 +20,12 @@ location /slweb {
     set $upstream_app synclounge;
     set $upstream_port 8088;
     set $upstream_proto http;
+    
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "upgrade";
 
-    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 }
 if ($http_referer ~* /slweb) {
     # Due to a bug in SyncLounge, some requests like /config don't respect the base url (web root) setting
@@ -45,10 +46,11 @@ location /slserver {
     set $upstream_port 8089;
     set $upstream_proto http;
 
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "upgrade";
 
-    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 }
 if ($http_referer ~* /slserver) {
     # Due to a bug in SyncLounge, some requests like socket.io don't respect the base url (server root) setting

From 434f53684691d22b6a894cc6c26fb29dd438ca45 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Mon, 23 Mar 2020 15:15:54 -0500
Subject: [PATCH 074/126] Update organizr.subfolder.conf.sample

Reordering to keep in line with other samples
---
 organizr.subfolder.conf.sample | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/organizr.subfolder.conf.sample b/organizr.subfolder.conf.sample
index 9acaee0..ab3f621 100644
--- a/organizr.subfolder.conf.sample
+++ b/organizr.subfolder.conf.sample
@@ -10,13 +10,14 @@ location ^~ / {
     #error_page 401 =200 /login;
 
     include /config/nginx/proxy.conf;
-    proxy_intercept_errors on;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app organizr;
     set $upstream_port 80;
     set $upstream_proto http;
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
+    proxy_intercept_errors on;
+
 }
 
 # Optional redirect server errors to organizr error pages

From d26ec404ba688fbe1a78282ea88105fe0945309a Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Wed, 25 Mar 2020 09:38:06 -0500
Subject: [PATCH 075/126] Revert "Fix for 404 and PHP errors"

---
 organizr.subfolder.conf.sample | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/organizr.subfolder.conf.sample b/organizr.subfolder.conf.sample
index ab3f621..aae5aff 100644
--- a/organizr.subfolder.conf.sample
+++ b/organizr.subfolder.conf.sample
@@ -1,6 +1,6 @@
 # In order to use this location block you need to edit the default file one folder up and comment out the / location
 
-location ^~ / {
+location / {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
     #auth_basic_user_file /config/nginx/.htpasswd;
@@ -16,8 +16,6 @@ location ^~ / {
     set $upstream_proto http;
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-    proxy_intercept_errors on;
-
 }
 
 # Optional redirect server errors to organizr error pages

From f08fb225d28e3b99a2f402878431f8f119f7fc8b Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Thu, 9 Apr 2020 21:33:29 -0400
Subject: [PATCH 076/126] fix emby websockets

---
 emby.subdomain.conf.sample | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/emby.subdomain.conf.sample b/emby.subdomain.conf.sample
index f828be6..b32543c 100644
--- a/emby.subdomain.conf.sample
+++ b/emby.subdomain.conf.sample
@@ -25,15 +25,6 @@ server {
 
         proxy_set_header Range $http_range;
         proxy_set_header If-Range $http_if_range;
-    }
-
-    location ~ (/emby)?/socket {
-        include /config/nginx/proxy.conf;
-        resolver 127.0.0.11 valid=30s;
-        set $upstream_app emby;
-        set $upstream_port 8096;
-        set $upstream_proto http;
-        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection $http_connection;

From ed87744a7424f3977086cd999e6beb6d9fed14a2 Mon Sep 17 00:00:00 2001
From: Billy Syrett <syrett.billy@gmail.com>
Date: Tue, 14 Apr 2020 23:01:14 +0100
Subject: [PATCH 077/126] added gotify proxy conf

---
 gotify.subdomain.conf.sample | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 gotify.subdomain.conf.sample

diff --git a/gotify.subdomain.conf.sample b/gotify.subdomain.conf.sample
new file mode 100644
index 0000000..3be3404
--- /dev/null
+++ b/gotify.subdomain.conf.sample
@@ -0,0 +1,32 @@
+# make sure that your dns has a cname set for gotify
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name gotify.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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_gotify gotify;
+        proxy_pass http://$upstream_gotify;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+    }
+}
\ No newline at end of file

From a9d1163023809d4ac1b3eac8612cfda8dd2a969b Mon Sep 17 00:00:00 2001
From: Billy Syrett <syrett.billy@gmail.com>
Date: Tue, 14 Apr 2020 23:18:45 +0100
Subject: [PATCH 078/126] changed proxy_pass format and variables

---
 gotify.subdomain.conf.sample | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gotify.subdomain.conf.sample b/gotify.subdomain.conf.sample
index 3be3404..c4d439a 100644
--- a/gotify.subdomain.conf.sample
+++ b/gotify.subdomain.conf.sample
@@ -24,8 +24,10 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_gotify gotify;
-        proxy_pass http://$upstream_gotify;
+        set $upstream_app gotify;
+        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";
     }

From 2fa6580a6734db8df22f2cca8564ec0b9b3e3c75 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Sun, 19 Apr 2020 18:14:36 -0500
Subject: [PATCH 079/126] Set upstream for NZBHydra2

---
 nzbhydra.subdomain.conf.sample | 12 ++++++------
 nzbhydra.subfolder.conf.sample | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/nzbhydra.subdomain.conf.sample b/nzbhydra.subdomain.conf.sample
index f8d2a81..bb4e3ce 100644
--- a/nzbhydra.subdomain.conf.sample
+++ b/nzbhydra.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_app hydra2;
+        set $upstream_app nzbhydra2;
         set $upstream_port 5076;
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
@@ -34,7 +34,7 @@ server {
     location ~ (/nzbhydra)?/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_app hydra2;
+        set $upstream_app nzbhydra2;
         set $upstream_port 5076;
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
@@ -44,7 +44,7 @@ server {
     location ~ (/nzbhydra)?/getnzb {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_app hydra2;
+        set $upstream_app nzbhydra2;
         set $upstream_port 5076;
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
@@ -54,7 +54,7 @@ server {
     location ~ (/nzbhydra)?/gettorrent {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_app hydra2;
+        set $upstream_app nzbhydra2;
         set $upstream_port 5076;
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
@@ -64,7 +64,7 @@ server {
     location ~ (/nzbhydra)?/rss {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_app hydra2;
+        set $upstream_app nzbhydra2;
         set $upstream_port 5076;
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
@@ -74,7 +74,7 @@ server {
     location ~ (/nzbhydra)?/torznab/api {
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
-        set $upstream_app hydra2;
+        set $upstream_app nzbhydra2;
         set $upstream_port 5076;
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
diff --git a/nzbhydra.subfolder.conf.sample b/nzbhydra.subfolder.conf.sample
index 0bc40c1..d2bf22c 100644
--- a/nzbhydra.subfolder.conf.sample
+++ b/nzbhydra.subfolder.conf.sample
@@ -11,7 +11,7 @@ location ^~ /nzbhydra {
 
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_app hydra2;
+    set $upstream_app nzbhydra2;
     set $upstream_port 5076;
     set $upstream_proto http;
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
@@ -21,7 +21,7 @@ location ^~ /nzbhydra {
 location ^~ /nzbhydra/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_app hydra2;
+    set $upstream_app nzbhydra2;
     set $upstream_port 5076;
     set $upstream_proto http;
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
@@ -31,7 +31,7 @@ location ^~ /nzbhydra/api {
 location ^~ /nzbhydra/getnzb {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_app hydra2;
+    set $upstream_app nzbhydra2;
     set $upstream_port 5076;
     set $upstream_proto http;
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
@@ -41,7 +41,7 @@ location ^~ /nzbhydra/getnzb {
 location ^~ /nzbhydra/gettorrent {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_app hydra2;
+    set $upstream_app nzbhydra2;
     set $upstream_port 5076;
     set $upstream_proto http;
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
@@ -51,7 +51,7 @@ location ^~ /nzbhydra/gettorrent {
 location ^~ /nzbhydra/rss {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_app hydra2;
+    set $upstream_app nzbhydra2;
     set $upstream_port 5076;
     set $upstream_proto http;
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
@@ -61,7 +61,7 @@ location ^~ /nzbhydra/rss {
 location ^~ /nzbhydra/torznab/api {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
-    set $upstream_app hydra2;
+    set $upstream_app nzbhydra2;
     set $upstream_port 5076;
     set $upstream_proto http;
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;

From 7c581d27f9e29746b4a40e10345fcdc5ae085962 Mon Sep 17 00:00:00 2001
From: kiityman1 <47310786+kiityman1@users.noreply.github.com>
Date: Tue, 21 Apr 2020 17:55:07 -0700
Subject: [PATCH 080/126] Add Requestrr Subdomain and Subfolder Config

https://github.com/darkalfx/requestrr
---
 requestrr.subdomain.conf.sample | 33 +++++++++++++++++++++++++++++++++
 requestrr.subfolder.conf.sample | 20 ++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 requestrr.subdomain.conf.sample
 create mode 100644 requestrr.subfolder.conf.sample

diff --git a/requestrr.subdomain.conf.sample b/requestrr.subdomain.conf.sample
new file mode 100644
index 0000000..99d0e2e
--- /dev/null
+++ b/requestrr.subdomain.conf.sample
@@ -0,0 +1,33 @@
+# make sure that your dns has a cname set for requestrr
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name requestrr.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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 requestrr;
+        set $upstream_port 4545;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+    }
+}
diff --git a/requestrr.subfolder.conf.sample b/requestrr.subfolder.conf.sample
new file mode 100644
index 0000000..e3fcc76
--- /dev/null
+++ b/requestrr.subfolder.conf.sample
@@ -0,0 +1,20 @@
+
+# edit /config/configs/znc.conf and add URIPrefix = /znc/ in the line above </Listener> and restart the znc container
+
+location /requestrr {
+    # enable the next two lines for http auth
+    #auth_basic "Restricted";
+    #auth_basic_user_file /config/nginx/.htpasswd;
+
+    # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
+    #auth_request /auth;
+    #error_page 401 =200 /login;
+
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_app requestrr;
+    set $upstream_port 4545;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+}
\ No newline at end of file

From 9030ee2486d8ce1075ccfed1618783dffb5c7282 Mon Sep 17 00:00:00 2001
From: kiityman1 <47310786+kiityman1@users.noreply.github.com>
Date: Tue, 21 Apr 2020 20:16:16 -0700
Subject: [PATCH 081/126] Delete requestrr.subfolder.conf.sample

---
 requestrr.subfolder.conf.sample | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 requestrr.subfolder.conf.sample

diff --git a/requestrr.subfolder.conf.sample b/requestrr.subfolder.conf.sample
deleted file mode 100644
index e3fcc76..0000000
--- a/requestrr.subfolder.conf.sample
+++ /dev/null
@@ -1,20 +0,0 @@
-
-# edit /config/configs/znc.conf and add URIPrefix = /znc/ in the line above </Listener> and restart the znc container
-
-location /requestrr {
-    # enable the next two lines for http auth
-    #auth_basic "Restricted";
-    #auth_basic_user_file /config/nginx/.htpasswd;
-
-    # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
-    #auth_request /auth;
-    #error_page 401 =200 /login;
-
-    include /config/nginx/proxy.conf;
-    resolver 127.0.0.11 valid=30s;
-    set $upstream_app requestrr;
-    set $upstream_port 4545;
-    set $upstream_proto http;
-    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
-
-}
\ No newline at end of file

From b941ed3f772bcf6d700bc6fc7d2a132ed42062f2 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Wed, 22 Apr 2020 12:21:04 -0400
Subject: [PATCH 082/126] pydio-cells: switch to https

---
 pydio-cells.subdomain.conf.sample | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pydio-cells.subdomain.conf.sample b/pydio-cells.subdomain.conf.sample
index 99b6171..65c56e7 100644
--- a/pydio-cells.subdomain.conf.sample
+++ b/pydio-cells.subdomain.conf.sample
@@ -26,7 +26,7 @@ server {
         resolver 127.0.0.11 valid=30s;
         set $upstream_app pydio-cells;
         set $upstream_port 8080;
-        set $upstream_proto http;
+        set $upstream_proto https;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
     }
 
@@ -43,7 +43,7 @@ server {
         resolver 127.0.0.11 valid=30s;
         set $upstream_app pydio-cells;
         set $upstream_port 8080;
-        set $upstream_proto http;
+        set $upstream_proto https;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
         
         proxy_buffering off;

From 028afc12356279eaa92abcde2c4dba1287d914c2 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Wed, 22 Apr 2020 12:23:00 -0400
Subject: [PATCH 083/126] sycnlounge: add http access option

---
 synclounge.subdomain.conf.sample | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/synclounge.subdomain.conf.sample b/synclounge.subdomain.conf.sample
index f55dbf1..9b9f00c 100644
--- a/synclounge.subdomain.conf.sample
+++ b/synclounge.subdomain.conf.sample
@@ -4,6 +4,8 @@
 server {
     listen 443 ssl;
     listen [::]:443 ssl;
+    listen 80;
+    listen [::]:80;
 
     server_name synclounge.*;
 

From 528fc477699f9ba34bd24446c8955baacc11437d Mon Sep 17 00:00:00 2001
From: vinanrra <vicentefernandezguerra@gmail.com>
Date: Fri, 24 Apr 2020 11:51:33 +0200
Subject: [PATCH 084/126] Create mailu subfolder

This will need some disscusion, because i have edited the default docker-compose to make it works, but maybe those edit arent need it.
---
 mailu.subfolder.conf | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 mailu.subfolder.conf

diff --git a/mailu.subfolder.conf b/mailu.subfolder.conf
new file mode 100644
index 0000000..5f22bbf
--- /dev/null
+++ b/mailu.subfolder.conf
@@ -0,0 +1,30 @@
+# This config have been tested with "TLS_FLAVOR=mail"
+
+location /admin{
+    return 301 $scheme://$host/admin/;
+    proxy_redirect https://localhost https://DOMAIN.TDL; ## To avoid errors https://mailu.io/master/reverse.html
+}
+location ^~ /admin/ {
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_app front;
+    set $upstream_port 80;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+    proxy_redirect https://localhost https://DOMAIN.TDL; ## To avoid errors https://mailu.io/master/reverse.html
+
+}
+location /webmail{
+    return 301 $scheme://$host/webmail/;
+    proxy_redirect https://localhost https://DOMAIN.TDL; ## To avoid errors https://mailu.io/master/reverse.html
+}
+location ^~ /webmail/ {
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_app front;
+    set $upstream_port 80;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+    proxy_redirect https://localhost https://DOMAIN.TDL; ## To avoid errors https://mailu.io/master/reverse.html
+
+}

From 8c5e95ea56d2adbf62dd1c9e50be6c43a5b42c16 Mon Sep 17 00:00:00 2001
From: vinanrra <vicentefernandezguerra@gmail.com>
Date: Fri, 24 Apr 2020 12:00:14 +0200
Subject: [PATCH 085/126] Update mailu.subfolder.conf

---
 mailu.subfolder.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mailu.subfolder.conf b/mailu.subfolder.conf
index 5f22bbf..1d97d71 100644
--- a/mailu.subfolder.conf
+++ b/mailu.subfolder.conf
@@ -1,4 +1,6 @@
 # This config have been tested with "TLS_FLAVOR=mail"
+# To avoid errors you must change in docker-compose ports: 80 and 443, more info: https://mailu.io/1.7/reverse.html
+# Maybe the proxy_redirect arent need it, but it is working and are not harmful
 
 location /admin{
     return 301 $scheme://$host/admin/;

From 428f3cb7d11f95cc648431bdc5d5b40bfe4a14c8 Mon Sep 17 00:00:00 2001
From: vinanrra <vicentefernandezguerra@gmail.com>
Date: Fri, 24 Apr 2020 18:16:08 +0200
Subject: [PATCH 086/126] Updated

Modified to meet the others reverse proxies standards
---
 mailu.subfolder.conf | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/mailu.subfolder.conf b/mailu.subfolder.conf
index 1d97d71..536112d 100644
--- a/mailu.subfolder.conf
+++ b/mailu.subfolder.conf
@@ -1,7 +1,49 @@
+# mailu does not require a base url setting, but the container needs to be named front
+
 # This config have been tested with "TLS_FLAVOR=mail"
 # To avoid errors you must change in docker-compose ports: 80 and 443, more info: https://mailu.io/1.7/reverse.html
-# Maybe the proxy_redirect arent need it, but it is working and are not harmful
 
+location /admin{
+    return 301 $scheme://$host/admin/;
+}
+location ^~ /admin/ {
+    # enable the next two lines for http auth
+    #auth_basic "Restricted";
+    #auth_basic_user_file /config/nginx/.htpasswd;
+
+    # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
+    #auth_request /auth;
+    #error_page 401 =200 /login;
+    
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_app front;
+    set $upstream_port 80;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+}
+
+location /webmail{
+    return 301 $scheme://$host/webmail/;
+}
+location ^~ /webmail/ {
+    # enable the next two lines for http auth
+    #auth_basic "Restricted";
+    #auth_basic_user_file /config/nginx/.htpasswd;
+
+    # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
+    #auth_request /auth;
+    #error_page 401 =200 /login;
+    
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_app front;
+    set $upstream_port 80;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+}
 location /admin{
     return 301 $scheme://$host/admin/;
     proxy_redirect https://localhost https://DOMAIN.TDL; ## To avoid errors https://mailu.io/master/reverse.html

From ba392bba42fe9d97bd0276c9d059e34348fab6d3 Mon Sep 17 00:00:00 2001
From: vinanrra <vicentefernandezguerra@gmail.com>
Date: Fri, 24 Apr 2020 18:40:12 +0200
Subject: [PATCH 087/126] Create mailu.subdomain.conf

---
 mailu.subdomain.conf | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 mailu.subdomain.conf

diff --git a/mailu.subdomain.conf b/mailu.subdomain.conf
new file mode 100644
index 0000000..a8a44de
--- /dev/null
+++ b/mailu.subdomain.conf
@@ -0,0 +1,33 @@
+# make sure that your dns has a cname set for mailu and that your mailu front container is named front
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name mailu.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # 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 front;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+    }
+}

From f019d4bf4c28156924da8d94d9377a5c44a345ac Mon Sep 17 00:00:00 2001
From: vinanrra <vicentefernandezguerra@gmail.com>
Date: Fri, 24 Apr 2020 20:09:39 +0200
Subject: [PATCH 088/126] Update mailu.subfolder.conf

Ups forgot to remove duplicate things
---
 mailu.subfolder.conf | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/mailu.subfolder.conf b/mailu.subfolder.conf
index 536112d..ae033e8 100644
--- a/mailu.subfolder.conf
+++ b/mailu.subfolder.conf
@@ -44,31 +44,3 @@ location ^~ /webmail/ {
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
 }
-location /admin{
-    return 301 $scheme://$host/admin/;
-    proxy_redirect https://localhost https://DOMAIN.TDL; ## To avoid errors https://mailu.io/master/reverse.html
-}
-location ^~ /admin/ {
-    include /config/nginx/proxy.conf;
-    resolver 127.0.0.11 valid=30s;
-    set $upstream_app front;
-    set $upstream_port 80;
-    set $upstream_proto http;
-    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
-    proxy_redirect https://localhost https://DOMAIN.TDL; ## To avoid errors https://mailu.io/master/reverse.html
-
-}
-location /webmail{
-    return 301 $scheme://$host/webmail/;
-    proxy_redirect https://localhost https://DOMAIN.TDL; ## To avoid errors https://mailu.io/master/reverse.html
-}
-location ^~ /webmail/ {
-    include /config/nginx/proxy.conf;
-    resolver 127.0.0.11 valid=30s;
-    set $upstream_app front;
-    set $upstream_port 80;
-    set $upstream_proto http;
-    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
-    proxy_redirect https://localhost https://DOMAIN.TDL; ## To avoid errors https://mailu.io/master/reverse.html
-
-}

From f8b9cb371cb70ee5cfde40ec3adc4ef41e3596d4 Mon Sep 17 00:00:00 2001
From: vinanrra <vicentefernandezguerra@gmail.com>
Date: Fri, 24 Apr 2020 20:11:08 +0200
Subject: [PATCH 089/126] Rename mailu.subfolder.conf to
 mailu.subfolder.conf.sample

---
 mailu.subfolder.conf => mailu.subfolder.conf.sample | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename mailu.subfolder.conf => mailu.subfolder.conf.sample (100%)

diff --git a/mailu.subfolder.conf b/mailu.subfolder.conf.sample
similarity index 100%
rename from mailu.subfolder.conf
rename to mailu.subfolder.conf.sample

From 8d05f0bcc117b74d658f2f1324020066e6879ba6 Mon Sep 17 00:00:00 2001
From: vinanrra <vicentefernandezguerra@gmail.com>
Date: Fri, 24 Apr 2020 20:11:20 +0200
Subject: [PATCH 090/126] Rename mailu.subdomain.conf to
 mailu.subdomain.conf.sample

---
 mailu.subdomain.conf => mailu.subdomain.conf.sample | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename mailu.subdomain.conf => mailu.subdomain.conf.sample (100%)

diff --git a/mailu.subdomain.conf b/mailu.subdomain.conf.sample
similarity index 100%
rename from mailu.subdomain.conf
rename to mailu.subdomain.conf.sample

From f58155c255aecfed9f91ff92d422f56232499565 Mon Sep 17 00:00:00 2001
From: n-i-x <440158+n-i-x@users.noreply.github.com>
Date: Fri, 24 Apr 2020 20:57:56 -0400
Subject: [PATCH 091/126] Add a note about HTTP/2 and Transmission Chrome
 Extensions

---
 transmission.subdomain.conf.sample | 12 +++++++++++-
 transmission.subfolder.conf.sample | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/transmission.subdomain.conf.sample b/transmission.subdomain.conf.sample
index 54cd511..5d9147d 100644
--- a/transmission.subdomain.conf.sample
+++ b/transmission.subdomain.conf.sample
@@ -1,4 +1,14 @@
-# make sure that your dns has a cname set for transmission
+# Make sure that DNS has a cname set for transmission
+#
+# Some Transmission Chrome extensions cannot handle HTTP/2 proxies as they
+# rely on the HTTP Status Text to determine if they should add the
+# X-Transmission-Session-Id header or not. HTTP/2 does not return this text
+# so jQuery responses are empty. This causes RPCs to fail.
+#
+# If your extension is affected, you can remove http2 from the default server
+# in /config/nginx/site-confs/default or listen on a different port that has
+# no http2 servers defined. Better yet, submit a bug report with the
+# extension developer to fix their extensions to support HTTP/2.
 
 server {
     listen 443 ssl;
diff --git a/transmission.subfolder.conf.sample b/transmission.subfolder.conf.sample
index 468d4a0..5f81280 100644
--- a/transmission.subfolder.conf.sample
+++ b/transmission.subfolder.conf.sample
@@ -1,4 +1,14 @@
-# transmission does not require a base url setting
+# Transmission does not require a base url setting
+#
+# Some Transmission Chrome extensions cannot handle HTTP/2 proxies as they
+# rely on the HTTP Status Text to determine if they should add the
+# X-Transmission-Session-Id header or not. HTTP/2 does not return this text
+# so jQuery responses are empty. This causes RPCs to fail.
+#
+# If your extension is affected, you can remove http2 from the default server
+# in /config/nginx/site-confs/default or listen on a different port that has
+# no http2 servers defined. Better yet, submit a bug report with the
+# extension developer to fix their extensions to support HTTP/2.
 
 location ^~ /transmission {
     # enable the next two lines for http auth

From 2bbf93c2f2183250de4ddfc6fb4c811c7776df0e Mon Sep 17 00:00:00 2001
From: Blake <sreknob@hotmail.com>
Date: Sat, 25 Apr 2020 10:16:27 -0400
Subject: [PATCH 092/126] use $upstream_port in proxy_set_header

$upstream_port is defined in the blocks and used for proxy_pass but not proxy_set_header
---
 qbittorrent.subdomain.conf.sample | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/qbittorrent.subdomain.conf.sample b/qbittorrent.subdomain.conf.sample
index dc49215..c8b691e 100644
--- a/qbittorrent.subdomain.conf.sample
+++ b/qbittorrent.subdomain.conf.sample
@@ -30,7 +30,7 @@ server {
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
         proxy_set_header Referer '';
-        proxy_set_header Host $upstream_app:8080;
+        proxy_set_header Host $upstream_app:$upstream_port;
     }
 
     location ~ (/qbittorrent)?/api {
@@ -44,7 +44,7 @@ server {
         rewrite /qbittorrent(.*) $1 break;
 
         proxy_set_header Referer '';
-        proxy_set_header Host $upstream_app:8080;
+        proxy_set_header Host $upstream_app:$upstream_port;
     }
 
     location ~ (/qbittorrent)?/command {
@@ -58,7 +58,7 @@ server {
         rewrite /qbittorrent(.*) $1 break;
 
         proxy_set_header Referer '';
-        proxy_set_header Host $upstream_app:8080;
+        proxy_set_header Host $upstream_app:$upstream_port;
     }
 
     location ~ (/qbittorrent)?/query {
@@ -72,7 +72,7 @@ server {
         rewrite /qbittorrent(.*) $1 break;
 
         proxy_set_header Referer '';
-        proxy_set_header Host $upstream_app:8080;
+        proxy_set_header Host $upstream_app:$upstream_port;
     }
 
     location ~ (/qbittorrent)?/login {
@@ -86,7 +86,7 @@ server {
         rewrite /qbittorrent(.*) $1 break;
 
         proxy_set_header Referer '';
-        proxy_set_header Host $upstream_app:8080;
+        proxy_set_header Host $upstream_app:$upstream_port;
     }
 
     location ~ (/qbittorrent)?/sync {
@@ -100,6 +100,6 @@ server {
         rewrite /qbittorrent(.*) $1 break;
 
         proxy_set_header Referer '';
-        proxy_set_header Host $upstream_app:8080;
+        proxy_set_header Host $upstream_app:$upstream_port;
     }
 }

From 036c759e9d7d6883f9db987d8338a4e089bdca7d Mon Sep 17 00:00:00 2001
From: Blake <sreknob@hotmail.com>
Date: Sat, 25 Apr 2020 10:19:04 -0400
Subject: [PATCH 093/126] use $upstream_port in proxy_set_header

$upstream_port is defined in the blocks and used for proxy_pass but not proxy_set_header
---
 qbittorrent.subfolder.conf.sample | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/qbittorrent.subfolder.conf.sample b/qbittorrent.subfolder.conf.sample
index 7d56b98..1ac7896 100644
--- a/qbittorrent.subfolder.conf.sample
+++ b/qbittorrent.subfolder.conf.sample
@@ -22,7 +22,7 @@ location ^~ /qbittorrent/ {
     rewrite /qbittorrent(.*) $1 break;
 
     proxy_set_header Referer '';
-    proxy_set_header Host $upstream_app:8080;
+    proxy_set_header Host $upstream_app:$upstream_port;
 }
 
 location ^~ /qbittorrent/api {
@@ -36,7 +36,7 @@ location ^~ /qbittorrent/api {
     rewrite /qbittorrent(.*) $1 break;
 
     proxy_set_header Referer '';
-    proxy_set_header Host $upstream_app:8080;
+    proxy_set_header Host $upstream_app:$upstream_port;
 }
 
 location ^~ /qbittorrent/command {
@@ -50,7 +50,7 @@ location ^~ /qbittorrent/command {
     rewrite /qbittorrent(.*) $1 break;
 
     proxy_set_header Referer '';
-    proxy_set_header Host $upstream_app:8080;
+    proxy_set_header Host $upstream_app:$upstream_port;
 }
 
 location ^~ /qbittorrent/query {
@@ -64,7 +64,7 @@ location ^~ /qbittorrent/query {
     rewrite /qbittorrent(.*) $1 break;
 
     proxy_set_header Referer '';
-    proxy_set_header Host $upstream_app:8080;
+    proxy_set_header Host $upstream_app:$upstream_port;
 }
 
 location ^~ /qbittorrent/login {
@@ -78,7 +78,7 @@ location ^~ /qbittorrent/login {
     rewrite /qbittorrent(.*) $1 break;
 
     proxy_set_header Referer '';
-    proxy_set_header Host $upstream_app:8080;
+    proxy_set_header Host $upstream_app:$upstream_port;
 }
 
 location ^~ /qbittorrent/sync {
@@ -92,5 +92,5 @@ location ^~ /qbittorrent/sync {
     rewrite /qbittorrent(.*) $1 break;
 
     proxy_set_header Referer '';
-    proxy_set_header Host $upstream_app:8080;
+    proxy_set_header Host $upstream_app:$upstream_port;
 }

From 2bde2519e5402b42974497a514f238064f2533fb Mon Sep 17 00:00:00 2001
From: kiityman1 <47310786+kiityman1@users.noreply.github.com>
Date: Sat, 25 Apr 2020 19:41:35 -0700
Subject: [PATCH 094/126] Rename librespeed.subdomain.com.sample to
 librespeed.subdomain.conf.sample

---
 ...speed.subdomain.com.sample => librespeed.subdomain.conf.sample | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename librespeed.subdomain.com.sample => librespeed.subdomain.conf.sample (100%)

diff --git a/librespeed.subdomain.com.sample b/librespeed.subdomain.conf.sample
similarity index 100%
rename from librespeed.subdomain.com.sample
rename to librespeed.subdomain.conf.sample

From cdf0459b4bf554d8b6e827cc5fe017e72b6708e1 Mon Sep 17 00:00:00 2001
From: MagicalCodeMonkey <MagicalCodeMonkey@users.noreply.github.com>
Date: Tue, 28 Apr 2020 23:19:44 -0400
Subject: [PATCH 095/126] Update SyncLounge sub-folder conf

- Update documentation
- Add optional redirect to force http
- Add optional redirect to use a custom base URL instead of /slweb
---
 synclounge.subfolder.conf.sample | 44 ++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/synclounge.subfolder.conf.sample b/synclounge.subfolder.conf.sample
index 07b3ccc..b959338 100644
--- a/synclounge.subfolder.conf.sample
+++ b/synclounge.subfolder.conf.sample
@@ -1,11 +1,39 @@
-# Use this if you are using the `latest` or `alpine` tags for the container, which contains both the web client and server applications.
-# Make sure that you have set the web base url (webroot/WEB_ROOT setting) to '/slweb' or change all occurrences of `/slweb` below to match your settings.
-# The server base url (serverroot/SERVER_ROOT) defaults to '/slserver'. If you change this setting, change all occurrences of '/slserver' below
+# Use this if you are using the LSIO SyncLounge container which has the web base url set to '/slweb' and the server base url set to '/slserver'
+# If you are using a different container or hosting natively make sure that you have set the web base url (webroot/WEB_ROOT setting) to '/slweb'
+#
+# To allow non-secure connections (http), which is required by some Plex clients, modify the first block in site-confs/default to look something like this:
+#server {
+#        listen 80 default_server;
+#        listen [::]:80 default_server;
+#        server_name _;
+#
+#        # Don't force redirect SyncLounge to https
+#        include /config/nginx/proxy-confs/synclounge.subfolder.conf;
+#
+#        location / {
+#            return 301 https://$host$request_uri;
+#        }
+#}
+
+
+# Uncomment to force SyncLounge to always load over http. Only use this if you've allowed http per the above instructions.
+#if ($scheme = https) {
+#    return 301 http://$host$request_uri;
+#}
 
 ###
-# Client
+# Webapp
 ###
 
+# Uncomment this to use a different base URL for the webapp. Change all instances of /synclounge to whatever you want.
+# location /synclounge {
+#     # Transparently redirect /synclounge to /slweb
+#     rewrite ^/synclounge/(.*)$ /slweb/$1 last;
+#     # Add trailing / after /synclounge if it doesn't exist
+#     rewrite ^/synclounge$ /synclounge/ permanent;
+#     return 404;
+# }
+
 location /slweb {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
@@ -20,7 +48,7 @@ location /slweb {
     set $upstream_app synclounge;
     set $upstream_port 8088;
     set $upstream_proto http;
-    
+
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
     proxy_set_header Upgrade $http_upgrade;
@@ -28,9 +56,9 @@ location /slweb {
 
 }
 if ($http_referer ~* /slweb) {
-    # Due to a bug in SyncLounge, some requests like /config don't respect the base url (web root) setting
+    # Some requests like /config don't respect the base url (web root) setting
     rewrite ^/config /slweb/config redirect;
-    # I think this is a bug as well
+    # Probably a bug as well
     rewrite ^/socket.io/(.*) /slserver/socket.io/$1? redirect;
 }
 
@@ -53,6 +81,6 @@ location /slserver {
 
 }
 if ($http_referer ~* /slserver) {
-    # Due to a bug in SyncLounge, some requests like socket.io don't respect the base url (server root) setting
+    # Some requests like socket.io don't respect the base url (server root) setting
     rewrite ^/socket.io/(.*) /slserver/socket.io/$1? redirect;
 }

From 02163a0126fe0438dfe0d25139a3be66a0ce31dc Mon Sep 17 00:00:00 2001
From: anoma <AlanNomander@gmail.com>
Date: Mon, 4 May 2020 18:14:46 +0000
Subject: [PATCH 096/126] Add config changes required to log real IP

---
 airsonic.subdomain.conf.sample | 1 +
 1 file changed, 1 insertion(+)

diff --git a/airsonic.subdomain.conf.sample b/airsonic.subdomain.conf.sample
index 80c1831..9b93dd5 100644
--- a/airsonic.subdomain.conf.sample
+++ b/airsonic.subdomain.conf.sample
@@ -1,4 +1,5 @@
 # make sure that your dns has a cname set for airsonic and that your airsonic container is not using a base url
+# add `server.use-forward-headers=true` to `/config/application.properties` to ensure logs contain real source IP
 
 server {
     listen 443 ssl;

From 264e9a4fd6c9962c012f2dfc282c9aeaf9ff2158 Mon Sep 17 00:00:00 2001
From: tedcook94 <33679293+tedcook94@users.noreply.github.com>
Date: Mon, 18 May 2020 12:04:15 -0500
Subject: [PATCH 097/126] Add subdomain config for official Seafile image

---
 seafile.subdomain.config.sample | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 seafile.subdomain.config.sample

diff --git a/seafile.subdomain.config.sample b/seafile.subdomain.config.sample
new file mode 100644
index 0000000..5679183
--- /dev/null
+++ b/seafile.subdomain.config.sample
@@ -0,0 +1,26 @@
+# For use with the official Seafile Docker image (https://download.seafile.com/published/seafile-manual/docker/deploy%20seafile%20with%20docker.md)
+# Requires that the seafile container uses the following env variables:
+#     SEAFILE_SERVER_LETSENCRYPT=true
+#     SEAFILE_SERVER_HOSTNAME=seafile.yourdomain.com
+# Restart or create the seafile container after enabling this subdomain and restarting the letsencrypt contianer
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name seafile.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    location / {
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_app seafile;
+        set $upstream_port 443;
+        set $upstream_proto https;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+    }
+}

From eb5510831bac735b8b68c6433d78452f0fa6dd31 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Tue, 5 May 2020 14:37:32 -0400
Subject: [PATCH 098/126] add authelia subdomain conf and add auth support

---
 adguard.subdomain.conf.sample          |  6 ++++++
 adminer.subfolder.conf.sample          |  3 +++
 airsonic.subdomain.conf.sample         |  6 ++++++
 airsonic.subfolder.conf.sample         |  3 +++
 authelia.subdomain.conf.sample         | 23 +++++++++++++++++++++++
 bazarr.subdomain.conf.sample           |  6 ++++++
 bazarr.subfolder.conf.sample           |  3 +++
 beets.subdomain.conf.sample            |  6 ++++++
 beets.subfolder.conf.sample            |  3 +++
 bitwarden.subdomain.conf.sample        |  6 ++++++
 boinc.subdomain.conf.sample            |  6 ++++++
 booksonic.subdomain.conf.sample        |  6 ++++++
 booksonic.subfolder.conf.sample        |  3 +++
 bookstack.subdomain.conf.sample        |  3 +++
 calibre-web.subdomain.conf.sample      |  6 ++++++
 calibre-web.subfolder.conf.sample      |  3 +++
 calibre.subdomain.conf.sample          |  6 ++++++
 calibre.subfolder.conf.sample          |  3 +++
 code-server.subdomain.conf.sample      |  6 ++++++
 codimd.subdomain.conf.sample           |  6 ++++++
 couchpotato.subdomain.conf.sample      |  6 ++++++
 couchpotato.subfolder.conf.sample      |  3 +++
 deluge.subdomain.conf.sample           |  6 ++++++
 deluge.subfolder.conf.sample           |  3 +++
 dillinger.subdomain.conf.sample        |  6 ++++++
 documentserver.subdomain.conf.sample   |  6 ++++++
 dokuwiki.subdomain.conf.sample         |  6 ++++++
 domoticz.subdomain.conf.sample         |  6 ++++++
 domoticz.subfolder.conf.sample         |  3 +++
 dozzle.subfolder.conf.sample           |  3 +++
 duplicati.subdomain.conf.sample        |  6 ++++++
 duplicati.subfolder.conf.sample        |  3 +++
 embystat.subdomain.conf.sample         |  6 ++++++
 flood.subdomain.conf.sample            |  6 ++++++
 flood.subfolder.conf.sample            |  3 +++
 foldingathome.subdomain.conf.sample    |  6 ++++++
 freshrss.subdomain.conf.sample         |  6 ++++++
 freshrss.subfolder.conf.sample         |  3 +++
 ghost.subdomain.conf.sample            |  6 ++++++
 ghost.subfolder.conf.sample            |  3 +++
 gitea.subdomain.conf.sample            |  6 ++++++
 glances.subdomain.conf.sample          |  6 ++++++
 glances.subfolder.conf.sample          |  3 +++
 gotify.subdomain.conf.sample           |  6 ++++++
 grafana.subdomain.conf.sample          |  6 ++++++
 grocy.subdomain.conf.sample            |  6 ++++++
 guacamole.subdomain.conf.sample        |  6 ++++++
 guacamole.subfolder.conf.sample        |  3 +++
 headphones.subdomain.conf.sample       |  6 ++++++
 headphones.subfolder.conf.sample       |  3 +++
 heimdall.subdomain.conf.sample         |  6 ++++++
 heimdall.subfolder.conf.sample         |  3 +++
 homeassistant.subdomain.conf.sample    |  6 ++++++
 jackett.subdomain.conf.sample          |  6 ++++++
 jackett.subfolder.conf.sample          |  3 +++
 jenkins.subfolder.conf.sample          |  3 +++
 kanzi.subdomain.conf.sample            |  6 ++++++
 kanzi.subfolder.conf.sample            |  3 +++
 lazylibrarian.subdomain.conf.sample    |  6 ++++++
 lazylibrarian.subfolder.conf.sample    |  3 +++
 librespeed.subdomain.conf.sample       |  6 ++++++
 lidarr.subdomain.conf.sample           |  6 ++++++
 lidarr.subfolder.conf.sample           |  3 +++
 lychee.subdomain.conf.sample           |  6 ++++++
 mailu.subdomain.conf.sample            |  6 ++++++
 mailu.subfolder.conf.sample            |  6 ++++++
 medusa.subdomain.conf.sample           |  6 ++++++
 medusa.subfolder.conf.sample           |  3 +++
 monitorr.subdomain.conf.sample         |  6 ++++++
 monitorr.subfolder.conf.sample         |  3 +++
 mstream.subdomain.conf.sample          |  6 ++++++
 mylar.subdomain.conf.sample            |  6 ++++++
 mylar.subfolder.conf.sample            |  3 +++
 mytinytodo.subfolder.conf.sample       |  3 +++
 netboot.subdomain.conf.sample          |  6 ++++++
 netdata.subdomain.conf.sample          |  6 ++++++
 netdata.subfolder.conf.sample          |  3 +++
 nzbget.subdomain.conf.sample           |  6 ++++++
 nzbget.subfolder.conf.sample           |  3 +++
 nzbhydra.subdomain.conf.sample         |  6 ++++++
 nzbhydra.subfolder.conf.sample         |  3 +++
 ombi.subdomain.conf.sample             |  6 ++++++
 ombi.subfolder.conf.sample             |  3 +++
 openvpn-as.subdomain.conf.sample       |  9 +++++++++
 organizr.subdomain.conf.sample         |  6 ++++++
 organizr.subfolder.conf.sample         |  3 +++
 osticket.subdomain.conf.sample         |  6 ++++++
 phpmyadmin.subdomain.conf.sample       |  6 ++++++
 phpmyadmin.subfolder.conf.sample       |  3 +++
 pihole.subdomain.conf.sample           |  9 +++++++++
 pihole.subfolder.conf.sample           |  6 ++++++
 piwigo.subdomain.conf.sample           |  6 ++++++
 plex.subdomain.conf.sample             |  6 ++++++
 plex.subfolder.conf.sample             |  3 +++
 plexwebtools.subdomain.conf.sample     |  6 ++++++
 plexwebtools.subfolder.conf.sample     |  3 +++
 portainer.subdomain.conf.sample        |  9 +++++++++
 portainer.subfolder.conf.sample        |  3 +++
 prometheus.subdomain.conf.sample       |  6 ++++++
 pydio-cells.subdomain.conf.sample      |  9 +++++++++
 pydio.subdomain.conf.sample            |  6 ++++++
 pyload.subdomain.conf.sample           |  6 ++++++
 qbittorrent.subdomain.conf.sample      |  6 ++++++
 qbittorrent.subfolder.conf.sample      |  3 +++
 quassel-web.subdomain.conf.sample      |  6 ++++++
 quassel-web.subfolder.conf.sample      |  3 +++
 radarr.subdomain.conf.sample           |  6 ++++++
 radarr.subfolder.conf.sample           |  3 +++
 raneto.subdomain.conf.sample           |  6 ++++++
 requestrr.subdomain.conf.sample        |  6 ++++++
 resilio-sync.subdomain.conf.sample     |  6 ++++++
 rutorrent.subdomain.conf.sample        |  6 ++++++
 rutorrent.subfolder.conf.sample        |  3 +++
 sabnzbd.subdomain.conf.sample          |  6 ++++++
 sabnzbd.subfolder.conf.sample          |  3 +++
 scope.subfolder.conf.sample            |  3 +++
 sickrage.subdomain.conf.sample         |  6 ++++++
 sickrage.subfolder.conf.sample         |  3 +++
 smokeping.subdomain.conf.sample        |  6 ++++++
 smokeping.subfolder.conf.sample        |  3 +++
 sonarr.subdomain.conf.sample           |  6 ++++++
 sonarr.subfolder.conf.sample           |  3 +++
 statping.subdomain.conf.sample         |  6 ++++++
 synclounge.subdomain.conf.sample       |  6 ++++++
 synclounge.subfolder.conf.sample       |  3 +++
 syncthing.subdomain.conf.sample        |  6 ++++++
 taisun.subdomain.conf.sample           |  6 ++++++
 tautulli.subdomain.conf.sample         |  6 ++++++
 tautulli.subfolder.conf.sample         |  3 +++
 tdarr.subdomain.conf.sample            |  6 ++++++
 thelounge.subdomain.conf.sample        |  6 ++++++
 thelounge.subfolder.conf.sample        |  3 +++
 transmission.subdomain.conf.sample     |  6 ++++++
 transmission.subfolder.conf.sample     |  3 +++
 tt-rss.subdomain.conf.sample           |  6 ++++++
 ubooquity.subdomain.conf.sample        |  6 ++++++
 ubooquity.subfolder.conf.sample        |  3 +++
 unifi-controller.subdomain.conf.sample |  9 +++++++++
 znc.subdomain.conf.sample              |  6 ++++++
 znc.subfolder.conf.sample              |  3 +++
 140 files changed, 713 insertions(+)
 create mode 100644 authelia.subdomain.conf.sample

diff --git a/adguard.subdomain.conf.sample b/adguard.subdomain.conf.sample
index 6f409df..75566b4 100644
--- a/adguard.subdomain.conf.sample
+++ b/adguard.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app adguard;
diff --git a/adminer.subfolder.conf.sample b/adminer.subfolder.conf.sample
index ec0f55a..e7e63ab 100644
--- a/adminer.subfolder.conf.sample
+++ b/adminer.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /adminer/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app adminer;
diff --git a/airsonic.subdomain.conf.sample b/airsonic.subdomain.conf.sample
index 9b93dd5..4256323 100644
--- a/airsonic.subdomain.conf.sample
+++ b/airsonic.subdomain.conf.sample
@@ -14,6 +14,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -23,6 +26,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app airsonic;
diff --git a/airsonic.subfolder.conf.sample b/airsonic.subfolder.conf.sample
index 44be55c..8f5b464 100644
--- a/airsonic.subfolder.conf.sample
+++ b/airsonic.subfolder.conf.sample
@@ -9,6 +9,9 @@ location ^~ /airsonic {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app airsonic;
diff --git a/authelia.subdomain.conf.sample b/authelia.subdomain.conf.sample
new file mode 100644
index 0000000..cac5c4e
--- /dev/null
+++ b/authelia.subdomain.conf.sample
@@ -0,0 +1,23 @@
+# make sure that your dns has a cname set for authelia
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name authelia.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    location / {
+
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_app authelia;
+        set $upstream_port 9091;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+    }
+}
\ No newline at end of file
diff --git a/bazarr.subdomain.conf.sample b/bazarr.subdomain.conf.sample
index c8054a1..4e8d190 100644
--- a/bazarr.subdomain.conf.sample
+++ b/bazarr.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app bazarr;
diff --git a/bazarr.subfolder.conf.sample b/bazarr.subfolder.conf.sample
index a9bec6e..b111bb4 100644
--- a/bazarr.subfolder.conf.sample
+++ b/bazarr.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /bazarr/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app bazarr;
diff --git a/beets.subdomain.conf.sample b/beets.subdomain.conf.sample
index 38d604e..4ddcbe6 100644
--- a/beets.subdomain.conf.sample
+++ b/beets.subdomain.conf.sample
@@ -14,6 +14,9 @@ server {
     #enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         #enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -23,6 +26,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app beets;
diff --git a/beets.subfolder.conf.sample b/beets.subfolder.conf.sample
index 559e70d..e40c790 100644
--- a/beets.subfolder.conf.sample
+++ b/beets.subfolder.conf.sample
@@ -9,6 +9,9 @@ location /beets {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app beets;
diff --git a/bitwarden.subdomain.conf.sample b/bitwarden.subdomain.conf.sample
index 59daab6..c37a13c 100644
--- a/bitwarden.subdomain.conf.sample
+++ b/bitwarden.subdomain.conf.sample
@@ -14,6 +14,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -23,6 +26,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app bitwarden;
diff --git a/boinc.subdomain.conf.sample b/boinc.subdomain.conf.sample
index 8be90cd..974a403 100644
--- a/boinc.subdomain.conf.sample
+++ b/boinc.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         proxy_buffering off;
         resolver 127.0.0.11 valid=30s;
diff --git a/booksonic.subdomain.conf.sample b/booksonic.subdomain.conf.sample
index 9f60aa5..97e4b03 100644
--- a/booksonic.subdomain.conf.sample
+++ b/booksonic.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app booksonic;
diff --git a/booksonic.subfolder.conf.sample b/booksonic.subfolder.conf.sample
index 203c2be..f6c7804 100644
--- a/booksonic.subfolder.conf.sample
+++ b/booksonic.subfolder.conf.sample
@@ -9,6 +9,9 @@ location ^~ /booksonic {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app booksonic;
diff --git a/bookstack.subdomain.conf.sample b/bookstack.subdomain.conf.sample
index 0bba432..adc69c0 100644
--- a/bookstack.subdomain.conf.sample
+++ b/bookstack.subdomain.conf.sample
@@ -21,6 +21,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app bookstack;
diff --git a/calibre-web.subdomain.conf.sample b/calibre-web.subdomain.conf.sample
index 54e122a..9c0f37c 100644
--- a/calibre-web.subdomain.conf.sample
+++ b/calibre-web.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
 	location / {
 		# enable the next two lines for http auth
 		#auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
 		#auth_request /auth;
 		#error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
 		resolver 127.0.0.11 valid=30s;
 		set $upstream_app calibre-web;
diff --git a/calibre-web.subfolder.conf.sample b/calibre-web.subfolder.conf.sample
index 42bfd0e..b3e067e 100644
--- a/calibre-web.subfolder.conf.sample
+++ b/calibre-web.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /calibre-web/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     resolver 127.0.0.11 valid=30s;
     set $upstream_app calibre-web;
     set $upstream_port 8083;
diff --git a/calibre.subdomain.conf.sample b/calibre.subdomain.conf.sample
index 8bc93e2..40fa5a7 100644
--- a/calibre.subdomain.conf.sample
+++ b/calibre.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         resolver 127.0.0.11 valid=30s;
         set $upstream_app calibre;
         set $upstream_port 8080;
diff --git a/calibre.subfolder.conf.sample b/calibre.subfolder.conf.sample
index 94b48d5..bf7d4ea 100644
--- a/calibre.subfolder.conf.sample
+++ b/calibre.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /calibre/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     resolver 127.0.0.11 valid=30s;
     set $upstream_app calibre;
     set $upstream_port 8080;
diff --git a/code-server.subdomain.conf.sample b/code-server.subdomain.conf.sample
index abeb37a..dfb41ac 100644
--- a/code-server.subdomain.conf.sample
+++ b/code-server.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app code-server;
diff --git a/codimd.subdomain.conf.sample b/codimd.subdomain.conf.sample
index 8472978..f2eaea9 100644
--- a/codimd.subdomain.conf.sample
+++ b/codimd.subdomain.conf.sample
@@ -15,6 +15,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -24,6 +27,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app codimd;
diff --git a/couchpotato.subdomain.conf.sample b/couchpotato.subdomain.conf.sample
index d72a016..57a1e91 100644
--- a/couchpotato.subdomain.conf.sample
+++ b/couchpotato.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app couchpotato;
diff --git a/couchpotato.subfolder.conf.sample b/couchpotato.subfolder.conf.sample
index 24aae5f..a0f0c3b 100644
--- a/couchpotato.subfolder.conf.sample
+++ b/couchpotato.subfolder.conf.sample
@@ -9,6 +9,9 @@ location ^~ /couchpotato {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app couchpotato;
diff --git a/deluge.subdomain.conf.sample b/deluge.subdomain.conf.sample
index 1bf40cd..74601c4 100644
--- a/deluge.subdomain.conf.sample
+++ b/deluge.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app deluge;
diff --git a/deluge.subfolder.conf.sample b/deluge.subfolder.conf.sample
index 13b550d..fdf9607 100644
--- a/deluge.subfolder.conf.sample
+++ b/deluge.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /deluge/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app deluge;
diff --git a/dillinger.subdomain.conf.sample b/dillinger.subdomain.conf.sample
index 16d1e48..afdee13 100644
--- a/dillinger.subdomain.conf.sample
+++ b/dillinger.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app dillinger;
diff --git a/documentserver.subdomain.conf.sample b/documentserver.subdomain.conf.sample
index 6d80844..6d60850 100644
--- a/documentserver.subdomain.conf.sample
+++ b/documentserver.subdomain.conf.sample
@@ -14,6 +14,9 @@ server {
     #enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         #enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -23,6 +26,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app documentserver;
diff --git a/dokuwiki.subdomain.conf.sample b/dokuwiki.subdomain.conf.sample
index a2655e3..8bc5695 100644
--- a/dokuwiki.subdomain.conf.sample
+++ b/dokuwiki.subdomain.conf.sample
@@ -14,6 +14,9 @@ server {
     #enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         #enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -23,6 +26,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app dokuwiki;
diff --git a/domoticz.subdomain.conf.sample b/domoticz.subdomain.conf.sample
index 9dc19aa..2d31de4 100644
--- a/domoticz.subdomain.conf.sample
+++ b/domoticz.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app domoticz;
diff --git a/domoticz.subfolder.conf.sample b/domoticz.subfolder.conf.sample
index ecd50c8..35d70df 100644
--- a/domoticz.subfolder.conf.sample
+++ b/domoticz.subfolder.conf.sample
@@ -9,6 +9,9 @@ location ^~ /domoticz/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app domoticz;
diff --git a/dozzle.subfolder.conf.sample b/dozzle.subfolder.conf.sample
index b433de0..692fa6f 100644
--- a/dozzle.subfolder.conf.sample
+++ b/dozzle.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /dozzle/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     chunked_transfer_encoding off;
     proxy_buffering off;
diff --git a/duplicati.subdomain.conf.sample b/duplicati.subdomain.conf.sample
index 7e9a4d3..6e9f6c7 100644
--- a/duplicati.subdomain.conf.sample
+++ b/duplicati.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         resolver 127.0.0.11 valid=30s;
         set $upstream_app duplicati;
         set $upstream_port 8200;
diff --git a/duplicati.subfolder.conf.sample b/duplicati.subfolder.conf.sample
index c7d580c..be466f5 100644
--- a/duplicati.subfolder.conf.sample
+++ b/duplicati.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /duplicati/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     resolver 127.0.0.11 valid=30s;
     set $upstream_app duplicati;
     set $upstream_port 8200;
diff --git a/embystat.subdomain.conf.sample b/embystat.subdomain.conf.sample
index 37e0d4b..57b87f2 100644
--- a/embystat.subdomain.conf.sample
+++ b/embystat.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app embystat;
diff --git a/flood.subdomain.conf.sample b/flood.subdomain.conf.sample
index bb37158..8c1882b 100644
--- a/flood.subdomain.conf.sample
+++ b/flood.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app flood;
diff --git a/flood.subfolder.conf.sample b/flood.subfolder.conf.sample
index b6dff64..d02fccb 100644
--- a/flood.subfolder.conf.sample
+++ b/flood.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /flood/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app flood;
diff --git a/foldingathome.subdomain.conf.sample b/foldingathome.subdomain.conf.sample
index fba1b6d..d48358c 100644
--- a/foldingathome.subdomain.conf.sample
+++ b/foldingathome.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         proxy_buffering off;
         resolver 127.0.0.11 valid=30s;
diff --git a/freshrss.subdomain.conf.sample b/freshrss.subdomain.conf.sample
index 7620169..be5dfba 100644
--- a/freshrss.subdomain.conf.sample
+++ b/freshrss.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app freshrss;
diff --git a/freshrss.subfolder.conf.sample b/freshrss.subfolder.conf.sample
index d7b0ae7..346464f 100644
--- a/freshrss.subfolder.conf.sample
+++ b/freshrss.subfolder.conf.sample
@@ -13,6 +13,9 @@ location ^~ /freshrss/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app freshrss;
diff --git a/ghost.subdomain.conf.sample b/ghost.subdomain.conf.sample
index 370cbfe..5eda845 100644
--- a/ghost.subdomain.conf.sample
+++ b/ghost.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     #enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         #enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app ghost;
diff --git a/ghost.subfolder.conf.sample b/ghost.subfolder.conf.sample
index b6310f7..0b05af9 100644
--- a/ghost.subfolder.conf.sample
+++ b/ghost.subfolder.conf.sample
@@ -10,6 +10,9 @@ location /blog {
   #auth_request /auth;
   #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
   include /config/nginx/proxy.conf;
   resolver 127.0.0.11 valid=30s;
   set $upstream_app ghost;
diff --git a/gitea.subdomain.conf.sample b/gitea.subdomain.conf.sample
index c957cb3..c68b6f2 100644
--- a/gitea.subdomain.conf.sample
+++ b/gitea.subdomain.conf.sample
@@ -17,6 +17,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -26,6 +29,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app gitea;
diff --git a/glances.subdomain.conf.sample b/glances.subdomain.conf.sample
index fd619e9..6daf6e4 100644
--- a/glances.subdomain.conf.sample
+++ b/glances.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app glances;
diff --git a/glances.subfolder.conf.sample b/glances.subfolder.conf.sample
index 611a6e3..39d643b 100644
--- a/glances.subfolder.conf.sample
+++ b/glances.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /glances/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app glances;
diff --git a/gotify.subdomain.conf.sample b/gotify.subdomain.conf.sample
index c4d439a..10e5e57 100644
--- a/gotify.subdomain.conf.sample
+++ b/gotify.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app gotify;
diff --git a/grafana.subdomain.conf.sample b/grafana.subdomain.conf.sample
index 5190106..0645c0d 100644
--- a/grafana.subdomain.conf.sample
+++ b/grafana.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app grafana;
diff --git a/grocy.subdomain.conf.sample b/grocy.subdomain.conf.sample
index 6bd603c..2bada88 100644
--- a/grocy.subdomain.conf.sample
+++ b/grocy.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app grocy;
diff --git a/guacamole.subdomain.conf.sample b/guacamole.subdomain.conf.sample
index 3b449b0..681b60a 100644
--- a/guacamole.subdomain.conf.sample
+++ b/guacamole.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         proxy_buffering off;
         resolver 127.0.0.11 valid=30s;
diff --git a/guacamole.subfolder.conf.sample b/guacamole.subfolder.conf.sample
index 074461d..3219d69 100644
--- a/guacamole.subfolder.conf.sample
+++ b/guacamole.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /guacamole/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     proxy_buffering off;
     resolver 127.0.0.11 valid=30s;
diff --git a/headphones.subdomain.conf.sample b/headphones.subdomain.conf.sample
index 68daa69..36b5901 100644
--- a/headphones.subdomain.conf.sample
+++ b/headphones.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app headphones;
diff --git a/headphones.subfolder.conf.sample b/headphones.subfolder.conf.sample
index 7c4c56d..1622ce8 100644
--- a/headphones.subfolder.conf.sample
+++ b/headphones.subfolder.conf.sample
@@ -9,6 +9,9 @@ location ^~ /headphones {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app headphones;
diff --git a/heimdall.subdomain.conf.sample b/heimdall.subdomain.conf.sample
index 1f97e69..5773997 100644
--- a/heimdall.subdomain.conf.sample
+++ b/heimdall.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app heimdall;
diff --git a/heimdall.subfolder.conf.sample b/heimdall.subfolder.conf.sample
index 50b92d0..b692b8c 100644
--- a/heimdall.subfolder.conf.sample
+++ b/heimdall.subfolder.conf.sample
@@ -9,6 +9,9 @@ location / {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app heimdall;
diff --git a/homeassistant.subdomain.conf.sample b/homeassistant.subdomain.conf.sample
index 07d8fd1..a5f8adc 100644
--- a/homeassistant.subdomain.conf.sample
+++ b/homeassistant.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app homeassistant;
diff --git a/jackett.subdomain.conf.sample b/jackett.subdomain.conf.sample
index 69b4ecd..4fd1969 100644
--- a/jackett.subdomain.conf.sample
+++ b/jackett.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app jackett;
diff --git a/jackett.subfolder.conf.sample b/jackett.subfolder.conf.sample
index f67020e..35cc8be 100644
--- a/jackett.subfolder.conf.sample
+++ b/jackett.subfolder.conf.sample
@@ -9,6 +9,9 @@ location ^~ /jackett {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app jackett;
diff --git a/jenkins.subfolder.conf.sample b/jenkins.subfolder.conf.sample
index cfef5ce..cf114e6 100644
--- a/jenkins.subfolder.conf.sample
+++ b/jenkins.subfolder.conf.sample
@@ -13,6 +13,9 @@ location ^~ /jenkins/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
 	# This is the maximum upload size
 	client_max_body_size 10m;
 
diff --git a/kanzi.subdomain.conf.sample b/kanzi.subdomain.conf.sample
index bf92ef4..e60463d 100644
--- a/kanzi.subdomain.conf.sample
+++ b/kanzi.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app kanzi;
diff --git a/kanzi.subfolder.conf.sample b/kanzi.subfolder.conf.sample
index 6227cfd..190759f 100644
--- a/kanzi.subfolder.conf.sample
+++ b/kanzi.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /kanzi/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app kanzi;
diff --git a/lazylibrarian.subdomain.conf.sample b/lazylibrarian.subdomain.conf.sample
index ada4918..fcb23b4 100644
--- a/lazylibrarian.subdomain.conf.sample
+++ b/lazylibrarian.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app lazylibrarian;
diff --git a/lazylibrarian.subfolder.conf.sample b/lazylibrarian.subfolder.conf.sample
index 682822a..37899f2 100644
--- a/lazylibrarian.subfolder.conf.sample
+++ b/lazylibrarian.subfolder.conf.sample
@@ -9,6 +9,9 @@ location ^~ /lazylibrarian {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app lazylibrarian;
diff --git a/librespeed.subdomain.conf.sample b/librespeed.subdomain.conf.sample
index e66804b..8864afe 100644
--- a/librespeed.subdomain.conf.sample
+++ b/librespeed.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app librespeed;
diff --git a/lidarr.subdomain.conf.sample b/lidarr.subdomain.conf.sample
index 36d267c..452798e 100644
--- a/lidarr.subdomain.conf.sample
+++ b/lidarr.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app lidarr;
diff --git a/lidarr.subfolder.conf.sample b/lidarr.subfolder.conf.sample
index f1ffee6..93623bc 100644
--- a/lidarr.subfolder.conf.sample
+++ b/lidarr.subfolder.conf.sample
@@ -9,6 +9,9 @@ location ^~ /lidarr {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app lidarr;
diff --git a/lychee.subdomain.conf.sample b/lychee.subdomain.conf.sample
index 4c6619e..b18e8b0 100644
--- a/lychee.subdomain.conf.sample
+++ b/lychee.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app lychee;
diff --git a/mailu.subdomain.conf.sample b/mailu.subdomain.conf.sample
index a8a44de..5108d3e 100644
--- a/mailu.subdomain.conf.sample
+++ b/mailu.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -21,6 +24,9 @@ server {
         # enable the next two lines for ldap auth
         #auth_request /auth;
         #error_page 401 =200 /login;
+
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
         
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
diff --git a/mailu.subfolder.conf.sample b/mailu.subfolder.conf.sample
index ae033e8..b26558d 100644
--- a/mailu.subfolder.conf.sample
+++ b/mailu.subfolder.conf.sample
@@ -14,6 +14,9 @@ location ^~ /admin/ {
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
     #error_page 401 =200 /login;
+
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
     
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
@@ -35,6 +38,9 @@ location ^~ /webmail/ {
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
     #error_page 401 =200 /login;
+
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
     
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
diff --git a/medusa.subdomain.conf.sample b/medusa.subdomain.conf.sample
index a9bbcd2..c8d1f38 100644
--- a/medusa.subdomain.conf.sample
+++ b/medusa.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
diff --git a/medusa.subfolder.conf.sample b/medusa.subfolder.conf.sample
index 1935744..80ee298 100644
--- a/medusa.subfolder.conf.sample
+++ b/medusa.subfolder.conf.sample
@@ -9,6 +9,9 @@ location ^~ /medusa {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     proxy_set_header Upgrade $http_upgrade;
     proxy_set_header Connection "upgrade";
diff --git a/monitorr.subdomain.conf.sample b/monitorr.subdomain.conf.sample
index 79572fb..fe12d2a 100644
--- a/monitorr.subdomain.conf.sample
+++ b/monitorr.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app monitorr;
diff --git a/monitorr.subfolder.conf.sample b/monitorr.subfolder.conf.sample
index da4fde2..a396df2 100644
--- a/monitorr.subfolder.conf.sample
+++ b/monitorr.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /monitorr/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app monitorr;
diff --git a/mstream.subdomain.conf.sample b/mstream.subdomain.conf.sample
index c1da8e2..4f5d8d7 100644
--- a/mstream.subdomain.conf.sample
+++ b/mstream.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
 	include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app mstream;
diff --git a/mylar.subdomain.conf.sample b/mylar.subdomain.conf.sample
index 2438a30..f6a82c4 100644
--- a/mylar.subdomain.conf.sample
+++ b/mylar.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app mylar;
diff --git a/mylar.subfolder.conf.sample b/mylar.subfolder.conf.sample
index d1bd203..556341b 100644
--- a/mylar.subfolder.conf.sample
+++ b/mylar.subfolder.conf.sample
@@ -9,6 +9,9 @@ location ^~ /mylar {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app mylar;
diff --git a/mytinytodo.subfolder.conf.sample b/mytinytodo.subfolder.conf.sample
index bb727e1..2f4c968 100644
--- a/mytinytodo.subfolder.conf.sample
+++ b/mytinytodo.subfolder.conf.sample
@@ -14,6 +14,9 @@ location ^~ /todo/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app mytinytodo;
diff --git a/netboot.subdomain.conf.sample b/netboot.subdomain.conf.sample
index 19b5d7b..0b4ddfd 100644
--- a/netboot.subdomain.conf.sample
+++ b/netboot.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app netboot;
diff --git a/netdata.subdomain.conf.sample b/netdata.subdomain.conf.sample
index 3d14ea5..88e12eb 100644
--- a/netdata.subdomain.conf.sample
+++ b/netdata.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app netdata;
diff --git a/netdata.subfolder.conf.sample b/netdata.subfolder.conf.sample
index f41325e..8c3fc52 100644
--- a/netdata.subfolder.conf.sample
+++ b/netdata.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /netdata/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app netdata;
diff --git a/nzbget.subdomain.conf.sample b/nzbget.subdomain.conf.sample
index 97f7376..3e69158 100644
--- a/nzbget.subdomain.conf.sample
+++ b/nzbget.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app nzbget;
diff --git a/nzbget.subfolder.conf.sample b/nzbget.subfolder.conf.sample
index 906331d..c6bab6b 100644
--- a/nzbget.subfolder.conf.sample
+++ b/nzbget.subfolder.conf.sample
@@ -9,6 +9,9 @@ location /nzbget {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app nzbget;
diff --git a/nzbhydra.subdomain.conf.sample b/nzbhydra.subdomain.conf.sample
index bb4e3ce..1d868f4 100644
--- a/nzbhydra.subdomain.conf.sample
+++ b/nzbhydra.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app nzbhydra2;
diff --git a/nzbhydra.subfolder.conf.sample b/nzbhydra.subfolder.conf.sample
index d2bf22c..a38939c 100644
--- a/nzbhydra.subfolder.conf.sample
+++ b/nzbhydra.subfolder.conf.sample
@@ -9,6 +9,9 @@ location ^~ /nzbhydra {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app nzbhydra2;
diff --git a/ombi.subdomain.conf.sample b/ombi.subdomain.conf.sample
index 862aa10..7afa6f5 100644
--- a/ombi.subdomain.conf.sample
+++ b/ombi.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app ombi;
diff --git a/ombi.subfolder.conf.sample b/ombi.subfolder.conf.sample
index 1cea015..3f2afde 100644
--- a/ombi.subfolder.conf.sample
+++ b/ombi.subfolder.conf.sample
@@ -13,6 +13,9 @@ location ^~ /ombi/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app ombi;
diff --git a/openvpn-as.subdomain.conf.sample b/openvpn-as.subdomain.conf.sample
index 3b0803d..e4e5ab6 100644
--- a/openvpn-as.subdomain.conf.sample
+++ b/openvpn-as.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app openvpn-as;
@@ -40,6 +46,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app openvpn-as;
diff --git a/organizr.subdomain.conf.sample b/organizr.subdomain.conf.sample
index 4bd4ff3..a7d981b 100644
--- a/organizr.subdomain.conf.sample
+++ b/organizr.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app organizr;
diff --git a/organizr.subfolder.conf.sample b/organizr.subfolder.conf.sample
index aae5aff..8a8f485 100644
--- a/organizr.subfolder.conf.sample
+++ b/organizr.subfolder.conf.sample
@@ -9,6 +9,9 @@ location / {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app organizr;
diff --git a/osticket.subdomain.conf.sample b/osticket.subdomain.conf.sample
index f79c597..665f177 100644
--- a/osticket.subdomain.conf.sample
+++ b/osticket.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app osticket;
diff --git a/phpmyadmin.subdomain.conf.sample b/phpmyadmin.subdomain.conf.sample
index 83844e4..1ba1218 100644
--- a/phpmyadmin.subdomain.conf.sample
+++ b/phpmyadmin.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app phpmyadmin;
diff --git a/phpmyadmin.subfolder.conf.sample b/phpmyadmin.subfolder.conf.sample
index c9ddee0..db1ffdf 100644
--- a/phpmyadmin.subfolder.conf.sample
+++ b/phpmyadmin.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /phpmyadmin/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app phpmyadmin;
diff --git a/pihole.subdomain.conf.sample b/pihole.subdomain.conf.sample
index 145d7cf..2396d79 100644
--- a/pihole.subdomain.conf.sample
+++ b/pihole.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app pihole;
@@ -41,6 +47,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app pihole;
diff --git a/pihole.subfolder.conf.sample b/pihole.subfolder.conf.sample
index b6c5877..bdda83a 100644
--- a/pihole.subfolder.conf.sample
+++ b/pihole.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /pihole/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app pihole;
@@ -35,6 +38,9 @@ location ^~ /pihole/admin/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app pihole;
diff --git a/piwigo.subdomain.conf.sample b/piwigo.subdomain.conf.sample
index e333945..6a24a11 100644
--- a/piwigo.subdomain.conf.sample
+++ b/piwigo.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app piwigo;
diff --git a/plex.subdomain.conf.sample b/plex.subdomain.conf.sample
index aa43513..5ee4c4b 100644
--- a/plex.subdomain.conf.sample
+++ b/plex.subdomain.conf.sample
@@ -18,6 +18,9 @@ server {
 
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
+
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -27,6 +30,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app plex;
diff --git a/plex.subfolder.conf.sample b/plex.subfolder.conf.sample
index 9953ba6..48e57db 100644
--- a/plex.subfolder.conf.sample
+++ b/plex.subfolder.conf.sample
@@ -18,6 +18,9 @@ location ^~ /plex/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app plex;
diff --git a/plexwebtools.subdomain.conf.sample b/plexwebtools.subdomain.conf.sample
index 247f152..cd53f10 100644
--- a/plexwebtools.subdomain.conf.sample
+++ b/plexwebtools.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app plex;
diff --git a/plexwebtools.subfolder.conf.sample b/plexwebtools.subfolder.conf.sample
index 7c880dd..f8a0947 100644
--- a/plexwebtools.subfolder.conf.sample
+++ b/plexwebtools.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /plexwebtools/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app plex;
diff --git a/portainer.subdomain.conf.sample b/portainer.subdomain.conf.sample
index 4b9ca34..da6e7c2 100644
--- a/portainer.subdomain.conf.sample
+++ b/portainer.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         resolver 127.0.0.11 valid=30s;
         set $upstream_app portainer;
         set $upstream_port 9000;
@@ -42,6 +48,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         resolver 127.0.0.11 valid=30s;
         set $upstream_app portainer;
         set $upstream_port 9000;
diff --git a/portainer.subfolder.conf.sample b/portainer.subfolder.conf.sample
index 00adcd4..662c865 100644
--- a/portainer.subfolder.conf.sample
+++ b/portainer.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /portainer/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app portainer;
diff --git a/prometheus.subdomain.conf.sample b/prometheus.subdomain.conf.sample
index b93b816..60c0ff8 100644
--- a/prometheus.subdomain.conf.sample
+++ b/prometheus.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app prometheus;
diff --git a/pydio-cells.subdomain.conf.sample b/pydio-cells.subdomain.conf.sample
index 65c56e7..deb639b 100644
--- a/pydio-cells.subdomain.conf.sample
+++ b/pydio-cells.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app pydio-cells;
@@ -39,6 +45,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app pydio-cells;
diff --git a/pydio.subdomain.conf.sample b/pydio.subdomain.conf.sample
index 97617f2..0c64614 100644
--- a/pydio.subdomain.conf.sample
+++ b/pydio.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app pydio;
diff --git a/pyload.subdomain.conf.sample b/pyload.subdomain.conf.sample
index 4822cd7..7f9b6d3 100644
--- a/pyload.subdomain.conf.sample
+++ b/pyload.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app pyload;
diff --git a/qbittorrent.subdomain.conf.sample b/qbittorrent.subdomain.conf.sample
index c8b691e..432add4 100644
--- a/qbittorrent.subdomain.conf.sample
+++ b/qbittorrent.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app qbittorrent;
diff --git a/qbittorrent.subfolder.conf.sample b/qbittorrent.subfolder.conf.sample
index 1ac7896..2f7b9eb 100644
--- a/qbittorrent.subfolder.conf.sample
+++ b/qbittorrent.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /qbittorrent/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app qbittorrent;
diff --git a/quassel-web.subdomain.conf.sample b/quassel-web.subdomain.conf.sample
index 3358c07..0eeb0d0 100644
--- a/quassel-web.subdomain.conf.sample
+++ b/quassel-web.subdomain.conf.sample
@@ -14,6 +14,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -23,6 +26,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app quassel-web;
diff --git a/quassel-web.subfolder.conf.sample b/quassel-web.subfolder.conf.sample
index cbe5891..34f8c17 100644
--- a/quassel-web.subfolder.conf.sample
+++ b/quassel-web.subfolder.conf.sample
@@ -10,6 +10,9 @@ location ^~ /quassel {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app quassel-web;
diff --git a/radarr.subdomain.conf.sample b/radarr.subdomain.conf.sample
index cccfccf..bdc4732 100644
--- a/radarr.subdomain.conf.sample
+++ b/radarr.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app radarr;
diff --git a/radarr.subfolder.conf.sample b/radarr.subfolder.conf.sample
index a2a3f88..7236dca 100644
--- a/radarr.subfolder.conf.sample
+++ b/radarr.subfolder.conf.sample
@@ -9,6 +9,9 @@ location ^~ /radarr {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app radarr;
diff --git a/raneto.subdomain.conf.sample b/raneto.subdomain.conf.sample
index 945a6db..2d7bc76 100644
--- a/raneto.subdomain.conf.sample
+++ b/raneto.subdomain.conf.sample
@@ -12,6 +12,9 @@ server {
     #enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         #enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -21,6 +24,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app raneto;
diff --git a/requestrr.subdomain.conf.sample b/requestrr.subdomain.conf.sample
index 99d0e2e..e63d26f 100644
--- a/requestrr.subdomain.conf.sample
+++ b/requestrr.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app requestrr;
diff --git a/resilio-sync.subdomain.conf.sample b/resilio-sync.subdomain.conf.sample
index 58fb60b..9d30f0b 100644
--- a/resilio-sync.subdomain.conf.sample
+++ b/resilio-sync.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app resilio-sync;
diff --git a/rutorrent.subdomain.conf.sample b/rutorrent.subdomain.conf.sample
index a8183ef..e5cab0e 100644
--- a/rutorrent.subdomain.conf.sample
+++ b/rutorrent.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app rutorrent;
diff --git a/rutorrent.subfolder.conf.sample b/rutorrent.subfolder.conf.sample
index dd74886..f14bc9e 100644
--- a/rutorrent.subfolder.conf.sample
+++ b/rutorrent.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /rutorrent/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app rutorrent;
diff --git a/sabnzbd.subdomain.conf.sample b/sabnzbd.subdomain.conf.sample
index f6f6d9f..2f334aa 100644
--- a/sabnzbd.subdomain.conf.sample
+++ b/sabnzbd.subdomain.conf.sample
@@ -15,6 +15,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -24,6 +27,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app sabnzbd;
diff --git a/sabnzbd.subfolder.conf.sample b/sabnzbd.subfolder.conf.sample
index d916a08..6a1b805 100644
--- a/sabnzbd.subfolder.conf.sample
+++ b/sabnzbd.subfolder.conf.sample
@@ -9,6 +9,9 @@ location ^~ /sabnzbd {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app sabnzbd;
diff --git a/scope.subfolder.conf.sample b/scope.subfolder.conf.sample
index 853c361..b22cda1 100644
--- a/scope.subfolder.conf.sample
+++ b/scope.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /scope/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app scope;
diff --git a/sickrage.subdomain.conf.sample b/sickrage.subdomain.conf.sample
index 3c6882f..eaf981d 100644
--- a/sickrage.subdomain.conf.sample
+++ b/sickrage.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app sickrage;
diff --git a/sickrage.subfolder.conf.sample b/sickrage.subfolder.conf.sample
index 5f8ea3b..0295217 100644
--- a/sickrage.subfolder.conf.sample
+++ b/sickrage.subfolder.conf.sample
@@ -9,6 +9,9 @@ location ^~ /sickrage {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app sickrage;
diff --git a/smokeping.subdomain.conf.sample b/smokeping.subdomain.conf.sample
index a3d642e..3178d6b 100644
--- a/smokeping.subdomain.conf.sample
+++ b/smokeping.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app smokeping;
diff --git a/smokeping.subfolder.conf.sample b/smokeping.subfolder.conf.sample
index f265640..5704292 100644
--- a/smokeping.subfolder.conf.sample
+++ b/smokeping.subfolder.conf.sample
@@ -9,6 +9,9 @@ location ^~ /smokeping {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app smokeping;
diff --git a/sonarr.subdomain.conf.sample b/sonarr.subdomain.conf.sample
index 5ff6e37..c3bc803 100644
--- a/sonarr.subdomain.conf.sample
+++ b/sonarr.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app sonarr;
diff --git a/sonarr.subfolder.conf.sample b/sonarr.subfolder.conf.sample
index 3f34059..926a2ad 100644
--- a/sonarr.subfolder.conf.sample
+++ b/sonarr.subfolder.conf.sample
@@ -9,6 +9,9 @@ location ^~ /sonarr {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app sonarr;
diff --git a/statping.subdomain.conf.sample b/statping.subdomain.conf.sample
index 1e99282..56ef96d 100644
--- a/statping.subdomain.conf.sample
+++ b/statping.subdomain.conf.sample
@@ -15,6 +15,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -24,6 +27,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app statup;
diff --git a/synclounge.subdomain.conf.sample b/synclounge.subdomain.conf.sample
index 9b9f00c..3a7a23f 100644
--- a/synclounge.subdomain.conf.sample
+++ b/synclounge.subdomain.conf.sample
@@ -18,6 +18,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -27,6 +30,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app synclounge;
diff --git a/synclounge.subfolder.conf.sample b/synclounge.subfolder.conf.sample
index 07b3ccc..3e0758c 100644
--- a/synclounge.subfolder.conf.sample
+++ b/synclounge.subfolder.conf.sample
@@ -15,6 +15,9 @@ location /slweb {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app synclounge;
diff --git a/syncthing.subdomain.conf.sample b/syncthing.subdomain.conf.sample
index a674ff6..259eb13 100644
--- a/syncthing.subdomain.conf.sample
+++ b/syncthing.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app syncthing;
diff --git a/taisun.subdomain.conf.sample b/taisun.subdomain.conf.sample
index 5836787..1dac9c5 100644
--- a/taisun.subdomain.conf.sample
+++ b/taisun.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app taisun;
diff --git a/tautulli.subdomain.conf.sample b/tautulli.subdomain.conf.sample
index ff5efcf..fe053c9 100644
--- a/tautulli.subdomain.conf.sample
+++ b/tautulli.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app tautulli;
diff --git a/tautulli.subfolder.conf.sample b/tautulli.subfolder.conf.sample
index 6a70ef5..c93cf60 100644
--- a/tautulli.subfolder.conf.sample
+++ b/tautulli.subfolder.conf.sample
@@ -9,6 +9,9 @@ location ^~ /tautulli {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app tautulli;
diff --git a/tdarr.subdomain.conf.sample b/tdarr.subdomain.conf.sample
index 806801d..df24656 100644
--- a/tdarr.subdomain.conf.sample
+++ b/tdarr.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app tdarr;
diff --git a/thelounge.subdomain.conf.sample b/thelounge.subdomain.conf.sample
index 9eb9578..41a6d39 100644
--- a/thelounge.subdomain.conf.sample
+++ b/thelounge.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app thelounge;
diff --git a/thelounge.subfolder.conf.sample b/thelounge.subfolder.conf.sample
index a3b663d..954057d 100644
--- a/thelounge.subfolder.conf.sample
+++ b/thelounge.subfolder.conf.sample
@@ -12,6 +12,9 @@ location ^~ /thelounge/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app thelounge;
diff --git a/transmission.subdomain.conf.sample b/transmission.subdomain.conf.sample
index 5d9147d..625ff67 100644
--- a/transmission.subdomain.conf.sample
+++ b/transmission.subdomain.conf.sample
@@ -23,6 +23,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -32,6 +35,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app transmission;
diff --git a/transmission.subfolder.conf.sample b/transmission.subfolder.conf.sample
index 5f81280..eb31042 100644
--- a/transmission.subfolder.conf.sample
+++ b/transmission.subfolder.conf.sample
@@ -19,6 +19,9 @@ location ^~ /transmission {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app transmission;
diff --git a/tt-rss.subdomain.conf.sample b/tt-rss.subdomain.conf.sample
index 2d8072e..0d5131b 100644
--- a/tt-rss.subdomain.conf.sample
+++ b/tt-rss.subdomain.conf.sample
@@ -14,6 +14,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -23,6 +26,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         resolver 127.0.0.11 valid=30s;
         set $upstream_app tt-rss;
         set $upstream_port 80;
diff --git a/ubooquity.subdomain.conf.sample b/ubooquity.subdomain.conf.sample
index 51b2a13..523d77e 100644
--- a/ubooquity.subdomain.conf.sample
+++ b/ubooquity.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app ubooquity;
diff --git a/ubooquity.subfolder.conf.sample b/ubooquity.subfolder.conf.sample
index fb0d76c..85392a1 100644
--- a/ubooquity.subfolder.conf.sample
+++ b/ubooquity.subfolder.conf.sample
@@ -9,6 +9,9 @@
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app ubooquity;
diff --git a/unifi-controller.subdomain.conf.sample b/unifi-controller.subdomain.conf.sample
index 0ba727d..14b9d5a 100644
--- a/unifi-controller.subdomain.conf.sample
+++ b/unifi-controller.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app unifi-controller;
@@ -40,6 +46,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app unifi-controller;
diff --git a/znc.subdomain.conf.sample b/znc.subdomain.conf.sample
index 3ab36f5..542eb10 100644
--- a/znc.subdomain.conf.sample
+++ b/znc.subdomain.conf.sample
@@ -13,6 +13,9 @@ server {
     # enable for ldap auth, fill in ldap details in ldap.conf
     #include /config/nginx/ldap.conf;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         # enable the next two lines for http auth
         #auth_basic "Restricted";
@@ -22,6 +25,9 @@ server {
         #auth_request /auth;
         #error_page 401 =200 /login;
 
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app znc;
diff --git a/znc.subfolder.conf.sample b/znc.subfolder.conf.sample
index 5c7b47b..4fa8bde 100644
--- a/znc.subfolder.conf.sample
+++ b/znc.subfolder.conf.sample
@@ -9,6 +9,9 @@ location /znc {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
+    # enable for Authelia
+    #include /config/nginx/authelia-location.conf;
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app znc;

From 88e56a4785a7326b6e35e41ee1b23e398c47891a Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Sun, 24 May 2020 16:10:03 -0400
Subject: [PATCH 099/126] add note about enabling in default site conf

---
 adminer.subfolder.conf.sample       | 2 +-
 airsonic.subfolder.conf.sample      | 2 +-
 bazarr.subfolder.conf.sample        | 2 +-
 beets.subfolder.conf.sample         | 2 +-
 booksonic.subfolder.conf.sample     | 2 +-
 calibre-web.subfolder.conf.sample   | 2 +-
 calibre.subfolder.conf.sample       | 2 +-
 couchpotato.subfolder.conf.sample   | 2 +-
 deluge.subfolder.conf.sample        | 2 +-
 domoticz.subfolder.conf.sample      | 2 +-
 dozzle.subfolder.conf.sample        | 2 +-
 duplicati.subfolder.conf.sample     | 2 +-
 flood.subfolder.conf.sample         | 2 +-
 freshrss.subfolder.conf.sample      | 2 +-
 ghost.subfolder.conf.sample         | 2 +-
 glances.subfolder.conf.sample       | 2 +-
 guacamole.subfolder.conf.sample     | 2 +-
 headphones.subfolder.conf.sample    | 2 +-
 heimdall.subfolder.conf.sample      | 2 +-
 jackett.subfolder.conf.sample       | 2 +-
 jenkins.subfolder.conf.sample       | 2 +-
 kanzi.subfolder.conf.sample         | 2 +-
 lazylibrarian.subfolder.conf.sample | 2 +-
 lidarr.subfolder.conf.sample        | 2 +-
 mailu.subfolder.conf.sample         | 4 ++--
 medusa.subfolder.conf.sample        | 2 +-
 monitorr.subfolder.conf.sample      | 2 +-
 mylar.subfolder.conf.sample         | 2 +-
 mytinytodo.subfolder.conf.sample    | 2 +-
 netdata.subfolder.conf.sample       | 2 +-
 nzbget.subfolder.conf.sample        | 2 +-
 nzbhydra.subfolder.conf.sample      | 2 +-
 ombi.subfolder.conf.sample          | 2 +-
 organizr.subfolder.conf.sample      | 2 +-
 phpmyadmin.subfolder.conf.sample    | 2 +-
 pihole.subfolder.conf.sample        | 4 ++--
 plex.subfolder.conf.sample          | 2 +-
 plexwebtools.subfolder.conf.sample  | 2 +-
 portainer.subfolder.conf.sample     | 2 +-
 qbittorrent.subfolder.conf.sample   | 2 +-
 quassel-web.subfolder.conf.sample   | 2 +-
 radarr.subfolder.conf.sample        | 2 +-
 rutorrent.subfolder.conf.sample     | 2 +-
 sabnzbd.subfolder.conf.sample       | 2 +-
 scope.subfolder.conf.sample         | 2 +-
 sickrage.subfolder.conf.sample      | 2 +-
 smokeping.subfolder.conf.sample     | 2 +-
 sonarr.subfolder.conf.sample        | 2 +-
 synclounge.subfolder.conf.sample    | 2 +-
 tautulli.subfolder.conf.sample      | 2 +-
 thelounge.subfolder.conf.sample     | 2 +-
 transmission.subfolder.conf.sample  | 2 +-
 ubooquity.subfolder.conf.sample     | 2 +-
 znc.subfolder.conf.sample           | 2 +-
 54 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/adminer.subfolder.conf.sample b/adminer.subfolder.conf.sample
index e7e63ab..6d99f9f 100644
--- a/adminer.subfolder.conf.sample
+++ b/adminer.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /adminer/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/airsonic.subfolder.conf.sample b/airsonic.subfolder.conf.sample
index 8f5b464..df250de 100644
--- a/airsonic.subfolder.conf.sample
+++ b/airsonic.subfolder.conf.sample
@@ -9,7 +9,7 @@ location ^~ /airsonic {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/bazarr.subfolder.conf.sample b/bazarr.subfolder.conf.sample
index b111bb4..8b7b7df 100644
--- a/bazarr.subfolder.conf.sample
+++ b/bazarr.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /bazarr/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/beets.subfolder.conf.sample b/beets.subfolder.conf.sample
index e40c790..c04b234 100644
--- a/beets.subfolder.conf.sample
+++ b/beets.subfolder.conf.sample
@@ -9,7 +9,7 @@ location /beets {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/booksonic.subfolder.conf.sample b/booksonic.subfolder.conf.sample
index f6c7804..e888eba 100644
--- a/booksonic.subfolder.conf.sample
+++ b/booksonic.subfolder.conf.sample
@@ -9,7 +9,7 @@ location ^~ /booksonic {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/calibre-web.subfolder.conf.sample b/calibre-web.subfolder.conf.sample
index b3e067e..596a6dd 100644
--- a/calibre-web.subfolder.conf.sample
+++ b/calibre-web.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /calibre-web/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     resolver 127.0.0.11 valid=30s;
diff --git a/calibre.subfolder.conf.sample b/calibre.subfolder.conf.sample
index bf7d4ea..5078c2d 100644
--- a/calibre.subfolder.conf.sample
+++ b/calibre.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /calibre/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     resolver 127.0.0.11 valid=30s;
diff --git a/couchpotato.subfolder.conf.sample b/couchpotato.subfolder.conf.sample
index a0f0c3b..28caa42 100644
--- a/couchpotato.subfolder.conf.sample
+++ b/couchpotato.subfolder.conf.sample
@@ -9,7 +9,7 @@ location ^~ /couchpotato {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/deluge.subfolder.conf.sample b/deluge.subfolder.conf.sample
index fdf9607..8604189 100644
--- a/deluge.subfolder.conf.sample
+++ b/deluge.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /deluge/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/domoticz.subfolder.conf.sample b/domoticz.subfolder.conf.sample
index 35d70df..978d328 100644
--- a/domoticz.subfolder.conf.sample
+++ b/domoticz.subfolder.conf.sample
@@ -9,7 +9,7 @@ location ^~ /domoticz/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/dozzle.subfolder.conf.sample b/dozzle.subfolder.conf.sample
index 692fa6f..4f435fc 100644
--- a/dozzle.subfolder.conf.sample
+++ b/dozzle.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /dozzle/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/duplicati.subfolder.conf.sample b/duplicati.subfolder.conf.sample
index be466f5..a254b67 100644
--- a/duplicati.subfolder.conf.sample
+++ b/duplicati.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /duplicati/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     resolver 127.0.0.11 valid=30s;
diff --git a/flood.subfolder.conf.sample b/flood.subfolder.conf.sample
index d02fccb..bf77198 100644
--- a/flood.subfolder.conf.sample
+++ b/flood.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /flood/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/freshrss.subfolder.conf.sample b/freshrss.subfolder.conf.sample
index 346464f..f5f3344 100644
--- a/freshrss.subfolder.conf.sample
+++ b/freshrss.subfolder.conf.sample
@@ -13,7 +13,7 @@ location ^~ /freshrss/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/ghost.subfolder.conf.sample b/ghost.subfolder.conf.sample
index 0b05af9..bb31785 100644
--- a/ghost.subfolder.conf.sample
+++ b/ghost.subfolder.conf.sample
@@ -10,7 +10,7 @@ location /blog {
   #auth_request /auth;
   #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
   include /config/nginx/proxy.conf;
diff --git a/glances.subfolder.conf.sample b/glances.subfolder.conf.sample
index 39d643b..e964cb8 100644
--- a/glances.subfolder.conf.sample
+++ b/glances.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /glances/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/guacamole.subfolder.conf.sample b/guacamole.subfolder.conf.sample
index 3219d69..378eb46 100644
--- a/guacamole.subfolder.conf.sample
+++ b/guacamole.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /guacamole/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/headphones.subfolder.conf.sample b/headphones.subfolder.conf.sample
index 1622ce8..c2e854e 100644
--- a/headphones.subfolder.conf.sample
+++ b/headphones.subfolder.conf.sample
@@ -9,7 +9,7 @@ location ^~ /headphones {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/heimdall.subfolder.conf.sample b/heimdall.subfolder.conf.sample
index b692b8c..79ae53f 100644
--- a/heimdall.subfolder.conf.sample
+++ b/heimdall.subfolder.conf.sample
@@ -9,7 +9,7 @@ location / {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/jackett.subfolder.conf.sample b/jackett.subfolder.conf.sample
index 35cc8be..3ad98ca 100644
--- a/jackett.subfolder.conf.sample
+++ b/jackett.subfolder.conf.sample
@@ -9,7 +9,7 @@ location ^~ /jackett {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/jenkins.subfolder.conf.sample b/jenkins.subfolder.conf.sample
index cf114e6..6dae4f5 100644
--- a/jenkins.subfolder.conf.sample
+++ b/jenkins.subfolder.conf.sample
@@ -13,7 +13,7 @@ location ^~ /jenkins/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
 	# This is the maximum upload size
diff --git a/kanzi.subfolder.conf.sample b/kanzi.subfolder.conf.sample
index 190759f..1814716 100644
--- a/kanzi.subfolder.conf.sample
+++ b/kanzi.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /kanzi/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/lazylibrarian.subfolder.conf.sample b/lazylibrarian.subfolder.conf.sample
index 37899f2..06002b7 100644
--- a/lazylibrarian.subfolder.conf.sample
+++ b/lazylibrarian.subfolder.conf.sample
@@ -9,7 +9,7 @@ location ^~ /lazylibrarian {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/lidarr.subfolder.conf.sample b/lidarr.subfolder.conf.sample
index 93623bc..a27a07f 100644
--- a/lidarr.subfolder.conf.sample
+++ b/lidarr.subfolder.conf.sample
@@ -9,7 +9,7 @@ location ^~ /lidarr {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/mailu.subfolder.conf.sample b/mailu.subfolder.conf.sample
index b26558d..1e664f4 100644
--- a/mailu.subfolder.conf.sample
+++ b/mailu.subfolder.conf.sample
@@ -15,7 +15,7 @@ location ^~ /admin/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
     
     include /config/nginx/proxy.conf;
@@ -39,7 +39,7 @@ location ^~ /webmail/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
     
     include /config/nginx/proxy.conf;
diff --git a/medusa.subfolder.conf.sample b/medusa.subfolder.conf.sample
index 80ee298..1deb9f0 100644
--- a/medusa.subfolder.conf.sample
+++ b/medusa.subfolder.conf.sample
@@ -9,7 +9,7 @@ location ^~ /medusa {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/monitorr.subfolder.conf.sample b/monitorr.subfolder.conf.sample
index a396df2..c93d98e 100644
--- a/monitorr.subfolder.conf.sample
+++ b/monitorr.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /monitorr/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/mylar.subfolder.conf.sample b/mylar.subfolder.conf.sample
index 556341b..307e998 100644
--- a/mylar.subfolder.conf.sample
+++ b/mylar.subfolder.conf.sample
@@ -9,7 +9,7 @@ location ^~ /mylar {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/mytinytodo.subfolder.conf.sample b/mytinytodo.subfolder.conf.sample
index 2f4c968..18917af 100644
--- a/mytinytodo.subfolder.conf.sample
+++ b/mytinytodo.subfolder.conf.sample
@@ -14,7 +14,7 @@ location ^~ /todo/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/netdata.subfolder.conf.sample b/netdata.subfolder.conf.sample
index 8c3fc52..a6794ca 100644
--- a/netdata.subfolder.conf.sample
+++ b/netdata.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /netdata/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/nzbget.subfolder.conf.sample b/nzbget.subfolder.conf.sample
index c6bab6b..e48d176 100644
--- a/nzbget.subfolder.conf.sample
+++ b/nzbget.subfolder.conf.sample
@@ -9,7 +9,7 @@ location /nzbget {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/nzbhydra.subfolder.conf.sample b/nzbhydra.subfolder.conf.sample
index a38939c..23f189c 100644
--- a/nzbhydra.subfolder.conf.sample
+++ b/nzbhydra.subfolder.conf.sample
@@ -9,7 +9,7 @@ location ^~ /nzbhydra {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/ombi.subfolder.conf.sample b/ombi.subfolder.conf.sample
index 3f2afde..bc46bb6 100644
--- a/ombi.subfolder.conf.sample
+++ b/ombi.subfolder.conf.sample
@@ -13,7 +13,7 @@ location ^~ /ombi/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/organizr.subfolder.conf.sample b/organizr.subfolder.conf.sample
index 8a8f485..3cfd948 100644
--- a/organizr.subfolder.conf.sample
+++ b/organizr.subfolder.conf.sample
@@ -9,7 +9,7 @@ location / {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/phpmyadmin.subfolder.conf.sample b/phpmyadmin.subfolder.conf.sample
index db1ffdf..a105038 100644
--- a/phpmyadmin.subfolder.conf.sample
+++ b/phpmyadmin.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /phpmyadmin/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/pihole.subfolder.conf.sample b/pihole.subfolder.conf.sample
index bdda83a..aa21ab0 100644
--- a/pihole.subfolder.conf.sample
+++ b/pihole.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /pihole/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
@@ -38,7 +38,7 @@ location ^~ /pihole/admin/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/plex.subfolder.conf.sample b/plex.subfolder.conf.sample
index 48e57db..ca12263 100644
--- a/plex.subfolder.conf.sample
+++ b/plex.subfolder.conf.sample
@@ -18,7 +18,7 @@ location ^~ /plex/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/plexwebtools.subfolder.conf.sample b/plexwebtools.subfolder.conf.sample
index f8a0947..72b9339 100644
--- a/plexwebtools.subfolder.conf.sample
+++ b/plexwebtools.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /plexwebtools/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/portainer.subfolder.conf.sample b/portainer.subfolder.conf.sample
index 662c865..dc3f49d 100644
--- a/portainer.subfolder.conf.sample
+++ b/portainer.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /portainer/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/qbittorrent.subfolder.conf.sample b/qbittorrent.subfolder.conf.sample
index 2f7b9eb..ef1aa89 100644
--- a/qbittorrent.subfolder.conf.sample
+++ b/qbittorrent.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /qbittorrent/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/quassel-web.subfolder.conf.sample b/quassel-web.subfolder.conf.sample
index 34f8c17..4748d50 100644
--- a/quassel-web.subfolder.conf.sample
+++ b/quassel-web.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /quassel {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/radarr.subfolder.conf.sample b/radarr.subfolder.conf.sample
index 7236dca..38a17bd 100644
--- a/radarr.subfolder.conf.sample
+++ b/radarr.subfolder.conf.sample
@@ -9,7 +9,7 @@ location ^~ /radarr {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/rutorrent.subfolder.conf.sample b/rutorrent.subfolder.conf.sample
index f14bc9e..069da2d 100644
--- a/rutorrent.subfolder.conf.sample
+++ b/rutorrent.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /rutorrent/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/sabnzbd.subfolder.conf.sample b/sabnzbd.subfolder.conf.sample
index 6a1b805..2ce4e92 100644
--- a/sabnzbd.subfolder.conf.sample
+++ b/sabnzbd.subfolder.conf.sample
@@ -9,7 +9,7 @@ location ^~ /sabnzbd {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/scope.subfolder.conf.sample b/scope.subfolder.conf.sample
index b22cda1..e48bede 100644
--- a/scope.subfolder.conf.sample
+++ b/scope.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /scope/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/sickrage.subfolder.conf.sample b/sickrage.subfolder.conf.sample
index 0295217..382c6cf 100644
--- a/sickrage.subfolder.conf.sample
+++ b/sickrage.subfolder.conf.sample
@@ -9,7 +9,7 @@ location ^~ /sickrage {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/smokeping.subfolder.conf.sample b/smokeping.subfolder.conf.sample
index 5704292..381e6ce 100644
--- a/smokeping.subfolder.conf.sample
+++ b/smokeping.subfolder.conf.sample
@@ -9,7 +9,7 @@ location ^~ /smokeping {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/sonarr.subfolder.conf.sample b/sonarr.subfolder.conf.sample
index 926a2ad..2c73446 100644
--- a/sonarr.subfolder.conf.sample
+++ b/sonarr.subfolder.conf.sample
@@ -9,7 +9,7 @@ location ^~ /sonarr {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/synclounge.subfolder.conf.sample b/synclounge.subfolder.conf.sample
index 3e0758c..b5e42ec 100644
--- a/synclounge.subfolder.conf.sample
+++ b/synclounge.subfolder.conf.sample
@@ -15,7 +15,7 @@ location /slweb {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/tautulli.subfolder.conf.sample b/tautulli.subfolder.conf.sample
index c93cf60..45abc7a 100644
--- a/tautulli.subfolder.conf.sample
+++ b/tautulli.subfolder.conf.sample
@@ -9,7 +9,7 @@ location ^~ /tautulli {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/thelounge.subfolder.conf.sample b/thelounge.subfolder.conf.sample
index 954057d..23bebda 100644
--- a/thelounge.subfolder.conf.sample
+++ b/thelounge.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /thelounge/ {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/transmission.subfolder.conf.sample b/transmission.subfolder.conf.sample
index eb31042..24a1898 100644
--- a/transmission.subfolder.conf.sample
+++ b/transmission.subfolder.conf.sample
@@ -19,7 +19,7 @@ location ^~ /transmission {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
diff --git a/ubooquity.subfolder.conf.sample b/ubooquity.subfolder.conf.sample
index 85392a1..8cb29de 100644
--- a/ubooquity.subfolder.conf.sample
+++ b/ubooquity.subfolder.conf.sample
@@ -9,7 +9,7 @@
         #auth_request /auth;
         #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
         include /config/nginx/proxy.conf;
diff --git a/znc.subfolder.conf.sample b/znc.subfolder.conf.sample
index 4fa8bde..160c3d0 100644
--- a/znc.subfolder.conf.sample
+++ b/znc.subfolder.conf.sample
@@ -9,7 +9,7 @@ location /znc {
     #auth_request /auth;
     #error_page 401 =200 /login;
 
-    # enable for Authelia
+    # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;

From a523d447d4ba00358fadaf8af22190f868544341 Mon Sep 17 00:00:00 2001
From: driz <40674481+drizuid@users.noreply.github.com>
Date: Mon, 25 May 2020 11:08:25 -0400
Subject: [PATCH 100/126] Rename seafile.subdomain.config.sample to
 seafile.subdomain.conf.sample

---
 seafile.subdomain.config.sample => seafile.subdomain.conf.sample | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename seafile.subdomain.config.sample => seafile.subdomain.conf.sample (100%)

diff --git a/seafile.subdomain.config.sample b/seafile.subdomain.conf.sample
similarity index 100%
rename from seafile.subdomain.config.sample
rename to seafile.subdomain.conf.sample

From 316a18f0ee8ba0851ba217e8244e6b49b9c1b4e8 Mon Sep 17 00:00:00 2001
From: driz <40674481+drizuid@users.noreply.github.com>
Date: Thu, 28 May 2020 09:41:50 -0400
Subject: [PATCH 101/126] Update organizr.subfolder.conf.sample

additional notes
---
 organizr.subfolder.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/organizr.subfolder.conf.sample b/organizr.subfolder.conf.sample
index 3cfd948..adc2f9c 100644
--- a/organizr.subfolder.conf.sample
+++ b/organizr.subfolder.conf.sample
@@ -1,4 +1,4 @@
-# In order to use this location block you need to edit the default file one folder up and comment out the / location
+# In order to use this location block you need to edit the default file one folder up and comment out the / and ~ \.php$ locations
 
 location / {
     # enable the next two lines for http auth

From fd17873bbfa6ad0143fa7afdb13240a1fb5ae6a9 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Sat, 30 May 2020 08:34:14 -0500
Subject: [PATCH 102/126] Add headers for radarr v3
 https://github.com/Radarr/Radarr/wiki/Health-Checks#could-not-connect-to-signalr

---
 radarr.subdomain.conf.sample | 4 ++++
 radarr.subfolder.conf.sample | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/radarr.subdomain.conf.sample b/radarr.subdomain.conf.sample
index cccfccf..3d95801 100644
--- a/radarr.subdomain.conf.sample
+++ b/radarr.subdomain.conf.sample
@@ -29,6 +29,8 @@ server {
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $http_connection;
     }
 
     location ~ (/radarr)?/api {
@@ -39,5 +41,7 @@ server {
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection $http_connection;
     }
 }
diff --git a/radarr.subfolder.conf.sample b/radarr.subfolder.conf.sample
index a2a3f88..3aaedb1 100644
--- a/radarr.subfolder.conf.sample
+++ b/radarr.subfolder.conf.sample
@@ -16,6 +16,8 @@ location ^~ /radarr {
     set $upstream_proto http;
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection $http_connection;
 }
 
 location ^~ /radarr/api {
@@ -26,4 +28,6 @@ location ^~ /radarr/api {
     set $upstream_proto http;
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection $http_connection;
 }

From 514c3df70874b3388a3090efe3993d1d9cb461e0 Mon Sep 17 00:00:00 2001
From: just-an-alt <65988493+just-an-alt@users.noreply.github.com>
Date: Sun, 31 May 2020 00:28:19 +0200
Subject: [PATCH 103/126] Create miniflux.subfolder.conf.sample

---
 miniflux.subfolder.conf.sample | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 miniflux.subfolder.conf.sample

diff --git a/miniflux.subfolder.conf.sample b/miniflux.subfolder.conf.sample
new file mode 100644
index 0000000..fb164c3
--- /dev/null
+++ b/miniflux.subfolder.conf.sample
@@ -0,0 +1,26 @@
+# set the environment variable "BASE_URL" to "http://localhost/miniflux/", or follow this guide to create a config file: https://miniflux.app/docs/configuration.html
+
+location /miniflux {
+    return 301 $scheme://$host/miniflux/;
+}
+
+location /miniflux/ {
+    # enable the next two lines for http auth
+    #auth_basic "Restricted";
+    #auth_basic_user_file /config/nginx/.htpasswd;
+
+    # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
+    #auth_request /auth;
+    #error_page 401 =200 /login;
+
+    # enable for Authelia, also enable authelia-server.conf in the default site config
+    #include /config/nginx/authelia-location.conf;
+
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_app miniflux;
+    set $upstream_port 8080;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+}

From b0a3c80e96cd023612222b61bcca80486b7b63f9 Mon Sep 17 00:00:00 2001
From: just-an-alt <65988493+just-an-alt@users.noreply.github.com>
Date: Sun, 31 May 2020 00:29:15 +0200
Subject: [PATCH 104/126] Create miniflux.subdomain.conf.sample

---
 miniflux.subdomain.conf.sample | 39 ++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 miniflux.subdomain.conf.sample

diff --git a/miniflux.subdomain.conf.sample b/miniflux.subdomain.conf.sample
new file mode 100644
index 0000000..b9ac4c3
--- /dev/null
+++ b/miniflux.subdomain.conf.sample
@@ -0,0 +1,39 @@
+# make sure that your dns has a cname set for miniflux
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name miniflux.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # enable the next two lines for ldap auth
+        #auth_request /auth;
+        #error_page 401 =200 /login;
+
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_app miniflux;
+        set $upstream_port 8080;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+    }
+}

From 115b6169e6a70d8d63a0e2ba107b44add97dd034 Mon Sep 17 00:00:00 2001
From: just-an-alt <65988493+just-an-alt@users.noreply.github.com>
Date: Sun, 31 May 2020 00:47:35 +0200
Subject: [PATCH 105/126] Change URL

---
 miniflux.subfolder.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/miniflux.subfolder.conf.sample b/miniflux.subfolder.conf.sample
index fb164c3..90f2f5a 100644
--- a/miniflux.subfolder.conf.sample
+++ b/miniflux.subfolder.conf.sample
@@ -1,4 +1,4 @@
-# set the environment variable "BASE_URL" to "http://localhost/miniflux/", or follow this guide to create a config file: https://miniflux.app/docs/configuration.html
+# set the environment variable "BASE_URL" to "https://yourdomain.url/miniflux/", or follow this guide to create a config file for Miniflux: https://miniflux.app/docs/configuration.html
 
 location /miniflux {
     return 301 $scheme://$host/miniflux/;

From 2b7e2d9a4993e113605fb7d679b58dfac6c44f07 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Sun, 31 May 2020 18:49:57 -0400
Subject: [PATCH 106/126] update authelia info on subfolder vs subdomain

---
 authelia.subdomain.conf.sample | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/authelia.subdomain.conf.sample b/authelia.subdomain.conf.sample
index cac5c4e..e4e68bc 100644
--- a/authelia.subdomain.conf.sample
+++ b/authelia.subdomain.conf.sample
@@ -1,4 +1,8 @@
 # make sure that your dns has a cname set for authelia
+# the default authelia-server and authelia-location confs included with letsencrypt rely on
+# subfolder proxy at "/authelia" and enabling of this proxy conf is not necessary.
+# But if you'd like to use authelia via subdomain, you can enable this proxy and set up your own
+# authelia-server and authelia-location confs as described in authelia docs.
 
 server {
     listen 443 ssl;
@@ -20,4 +24,4 @@ server {
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
     }
-}
\ No newline at end of file
+}

From 93ed849cbd4aa1f44c8803573b20e07f8188618b Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Tue, 2 Jun 2020 15:31:27 -0400
Subject: [PATCH 107/126] update ldap login page address

---
 adguard.subdomain.conf.sample          | 2 +-
 adminer.subfolder.conf.sample          | 2 +-
 airsonic.subdomain.conf.sample         | 2 +-
 airsonic.subfolder.conf.sample         | 2 +-
 bazarr.subdomain.conf.sample           | 2 +-
 bazarr.subfolder.conf.sample           | 2 +-
 beets.subdomain.conf.sample            | 2 +-
 beets.subfolder.conf.sample            | 2 +-
 bitwarden.subdomain.conf.sample        | 2 +-
 boinc.subdomain.conf.sample            | 2 +-
 booksonic.subdomain.conf.sample        | 2 +-
 booksonic.subfolder.conf.sample        | 2 +-
 bookstack.subdomain.conf.sample        | 2 +-
 calibre-web.subdomain.conf.sample      | 2 +-
 calibre-web.subfolder.conf.sample      | 2 +-
 calibre.subdomain.conf.sample          | 2 +-
 calibre.subfolder.conf.sample          | 2 +-
 code-server.subdomain.conf.sample      | 2 +-
 codimd.subdomain.conf.sample           | 2 +-
 couchpotato.subdomain.conf.sample      | 2 +-
 couchpotato.subfolder.conf.sample      | 2 +-
 deluge.subdomain.conf.sample           | 2 +-
 deluge.subfolder.conf.sample           | 2 +-
 dillinger.subdomain.conf.sample        | 2 +-
 documentserver.subdomain.conf.sample   | 2 +-
 dokuwiki.subdomain.conf.sample         | 2 +-
 domoticz.subdomain.conf.sample         | 2 +-
 domoticz.subfolder.conf.sample         | 2 +-
 dozzle.subfolder.conf.sample           | 2 +-
 duplicati.subdomain.conf.sample        | 2 +-
 duplicati.subfolder.conf.sample        | 2 +-
 embystat.subdomain.conf.sample         | 2 +-
 flood.subdomain.conf.sample            | 2 +-
 flood.subfolder.conf.sample            | 2 +-
 foldingathome.subdomain.conf.sample    | 2 +-
 freshrss.subdomain.conf.sample         | 2 +-
 freshrss.subfolder.conf.sample         | 2 +-
 ghost.subdomain.conf.sample            | 2 +-
 ghost.subfolder.conf.sample            | 2 +-
 gitea.subdomain.conf.sample            | 2 +-
 glances.subdomain.conf.sample          | 2 +-
 glances.subfolder.conf.sample          | 2 +-
 gotify.subdomain.conf.sample           | 2 +-
 grafana.subdomain.conf.sample          | 2 +-
 grocy.subdomain.conf.sample            | 2 +-
 guacamole.subdomain.conf.sample        | 2 +-
 guacamole.subfolder.conf.sample        | 2 +-
 headphones.subdomain.conf.sample       | 2 +-
 headphones.subfolder.conf.sample       | 2 +-
 heimdall.subdomain.conf.sample         | 2 +-
 heimdall.subfolder.conf.sample         | 2 +-
 homeassistant.subdomain.conf.sample    | 2 +-
 jackett.subdomain.conf.sample          | 2 +-
 jackett.subfolder.conf.sample          | 2 +-
 jenkins.subfolder.conf.sample          | 2 +-
 kanzi.subdomain.conf.sample            | 2 +-
 kanzi.subfolder.conf.sample            | 2 +-
 lazylibrarian.subdomain.conf.sample    | 2 +-
 lazylibrarian.subfolder.conf.sample    | 2 +-
 librespeed.subdomain.conf.sample       | 2 +-
 lidarr.subdomain.conf.sample           | 2 +-
 lidarr.subfolder.conf.sample           | 2 +-
 lychee.subdomain.conf.sample           | 2 +-
 mailu.subdomain.conf.sample            | 2 +-
 mailu.subfolder.conf.sample            | 4 ++--
 medusa.subdomain.conf.sample           | 2 +-
 medusa.subfolder.conf.sample           | 2 +-
 miniflux.subdomain.conf.sample         | 2 +-
 miniflux.subfolder.conf.sample         | 2 +-
 monitorr.subdomain.conf.sample         | 2 +-
 monitorr.subfolder.conf.sample         | 2 +-
 mstream.subdomain.conf.sample          | 2 +-
 mylar.subdomain.conf.sample            | 2 +-
 mylar.subfolder.conf.sample            | 2 +-
 mytinytodo.subfolder.conf.sample       | 2 +-
 netboot.subdomain.conf.sample          | 2 +-
 netdata.subdomain.conf.sample          | 2 +-
 netdata.subfolder.conf.sample          | 2 +-
 nzbget.subdomain.conf.sample           | 2 +-
 nzbget.subfolder.conf.sample           | 2 +-
 nzbhydra.subdomain.conf.sample         | 2 +-
 nzbhydra.subfolder.conf.sample         | 2 +-
 ombi.subdomain.conf.sample             | 2 +-
 ombi.subfolder.conf.sample             | 2 +-
 openvpn-as.subdomain.conf.sample       | 4 ++--
 organizr.subdomain.conf.sample         | 2 +-
 organizr.subfolder.conf.sample         | 2 +-
 osticket.subdomain.conf.sample         | 2 +-
 phpmyadmin.subdomain.conf.sample       | 2 +-
 phpmyadmin.subfolder.conf.sample       | 2 +-
 pihole.subdomain.conf.sample           | 4 ++--
 pihole.subfolder.conf.sample           | 4 ++--
 piwigo.subdomain.conf.sample           | 2 +-
 plex.subdomain.conf.sample             | 2 +-
 plex.subfolder.conf.sample             | 2 +-
 plexwebtools.subdomain.conf.sample     | 2 +-
 plexwebtools.subfolder.conf.sample     | 2 +-
 portainer.subdomain.conf.sample        | 4 ++--
 portainer.subfolder.conf.sample        | 2 +-
 prometheus.subdomain.conf.sample       | 2 +-
 pydio-cells.subdomain.conf.sample      | 4 ++--
 pydio.subdomain.conf.sample            | 2 +-
 pyload.subdomain.conf.sample           | 2 +-
 qbittorrent.subdomain.conf.sample      | 2 +-
 qbittorrent.subfolder.conf.sample      | 2 +-
 quassel-web.subdomain.conf.sample      | 2 +-
 quassel-web.subfolder.conf.sample      | 2 +-
 radarr.subdomain.conf.sample           | 2 +-
 radarr.subfolder.conf.sample           | 2 +-
 raneto.subdomain.conf.sample           | 2 +-
 requestrr.subdomain.conf.sample        | 2 +-
 resilio-sync.subdomain.conf.sample     | 2 +-
 rutorrent.subdomain.conf.sample        | 2 +-
 rutorrent.subfolder.conf.sample        | 2 +-
 sabnzbd.subdomain.conf.sample          | 2 +-
 sabnzbd.subfolder.conf.sample          | 2 +-
 scope.subfolder.conf.sample            | 2 +-
 sickrage.subdomain.conf.sample         | 2 +-
 sickrage.subfolder.conf.sample         | 2 +-
 smokeping.subdomain.conf.sample        | 2 +-
 smokeping.subfolder.conf.sample        | 2 +-
 sonarr.subdomain.conf.sample           | 2 +-
 sonarr.subfolder.conf.sample           | 2 +-
 statping.subdomain.conf.sample         | 2 +-
 synclounge.subdomain.conf.sample       | 2 +-
 synclounge.subfolder.conf.sample       | 2 +-
 syncthing.subdomain.conf.sample        | 2 +-
 taisun.subdomain.conf.sample           | 2 +-
 tautulli.subdomain.conf.sample         | 2 +-
 tautulli.subfolder.conf.sample         | 2 +-
 tdarr.subdomain.conf.sample            | 2 +-
 thelounge.subdomain.conf.sample        | 2 +-
 thelounge.subfolder.conf.sample        | 2 +-
 transmission.subdomain.conf.sample     | 2 +-
 transmission.subfolder.conf.sample     | 2 +-
 tt-rss.subdomain.conf.sample           | 2 +-
 ubooquity.subdomain.conf.sample        | 2 +-
 ubooquity.subfolder.conf.sample        | 2 +-
 unifi-controller.subdomain.conf.sample | 4 ++--
 znc.subdomain.conf.sample              | 2 +-
 znc.subfolder.conf.sample              | 2 +-
 141 files changed, 148 insertions(+), 148 deletions(-)

diff --git a/adguard.subdomain.conf.sample b/adguard.subdomain.conf.sample
index 75566b4..8fed7bb 100644
--- a/adguard.subdomain.conf.sample
+++ b/adguard.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/adminer.subfolder.conf.sample b/adminer.subfolder.conf.sample
index 6d99f9f..3f2bbde 100644
--- a/adminer.subfolder.conf.sample
+++ b/adminer.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /adminer/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/airsonic.subdomain.conf.sample b/airsonic.subdomain.conf.sample
index 4256323..be12419 100644
--- a/airsonic.subdomain.conf.sample
+++ b/airsonic.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/airsonic.subfolder.conf.sample b/airsonic.subfolder.conf.sample
index df250de..dae5833 100644
--- a/airsonic.subfolder.conf.sample
+++ b/airsonic.subfolder.conf.sample
@@ -7,7 +7,7 @@ location ^~ /airsonic {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/bazarr.subdomain.conf.sample b/bazarr.subdomain.conf.sample
index 4e8d190..8c6a276 100644
--- a/bazarr.subdomain.conf.sample
+++ b/bazarr.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/bazarr.subfolder.conf.sample b/bazarr.subfolder.conf.sample
index 8b7b7df..0a5d11c 100644
--- a/bazarr.subfolder.conf.sample
+++ b/bazarr.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /bazarr/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/beets.subdomain.conf.sample b/beets.subdomain.conf.sample
index 4ddcbe6..f435712 100644
--- a/beets.subdomain.conf.sample
+++ b/beets.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         #enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/beets.subfolder.conf.sample b/beets.subfolder.conf.sample
index c04b234..6c430fb 100644
--- a/beets.subfolder.conf.sample
+++ b/beets.subfolder.conf.sample
@@ -7,7 +7,7 @@ location /beets {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/bitwarden.subdomain.conf.sample b/bitwarden.subdomain.conf.sample
index c37a13c..a67092a 100644
--- a/bitwarden.subdomain.conf.sample
+++ b/bitwarden.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/boinc.subdomain.conf.sample b/boinc.subdomain.conf.sample
index 974a403..6cef0b2 100644
--- a/boinc.subdomain.conf.sample
+++ b/boinc.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/booksonic.subdomain.conf.sample b/booksonic.subdomain.conf.sample
index 97e4b03..0edff96 100644
--- a/booksonic.subdomain.conf.sample
+++ b/booksonic.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/booksonic.subfolder.conf.sample b/booksonic.subfolder.conf.sample
index e888eba..2b9cf64 100644
--- a/booksonic.subfolder.conf.sample
+++ b/booksonic.subfolder.conf.sample
@@ -7,7 +7,7 @@ location ^~ /booksonic {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/bookstack.subdomain.conf.sample b/bookstack.subdomain.conf.sample
index adc69c0..aecaacd 100644
--- a/bookstack.subdomain.conf.sample
+++ b/bookstack.subdomain.conf.sample
@@ -19,7 +19,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/calibre-web.subdomain.conf.sample b/calibre-web.subdomain.conf.sample
index 9c0f37c..dc922ae 100644
--- a/calibre-web.subdomain.conf.sample
+++ b/calibre-web.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
 		# enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
 		#auth_request /auth;
-		#error_page 401 =200 /login;
+		#error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/calibre-web.subfolder.conf.sample b/calibre-web.subfolder.conf.sample
index 596a6dd..b31f2b8 100644
--- a/calibre-web.subfolder.conf.sample
+++ b/calibre-web.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /calibre-web/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/calibre.subdomain.conf.sample b/calibre.subdomain.conf.sample
index 40fa5a7..368b4d7 100644
--- a/calibre.subdomain.conf.sample
+++ b/calibre.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/calibre.subfolder.conf.sample b/calibre.subfolder.conf.sample
index 5078c2d..2338ae2 100644
--- a/calibre.subfolder.conf.sample
+++ b/calibre.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /calibre/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/code-server.subdomain.conf.sample b/code-server.subdomain.conf.sample
index dfb41ac..e45708b 100644
--- a/code-server.subdomain.conf.sample
+++ b/code-server.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/codimd.subdomain.conf.sample b/codimd.subdomain.conf.sample
index f2eaea9..1671903 100644
--- a/codimd.subdomain.conf.sample
+++ b/codimd.subdomain.conf.sample
@@ -25,7 +25,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/couchpotato.subdomain.conf.sample b/couchpotato.subdomain.conf.sample
index 57a1e91..ea31fa3 100644
--- a/couchpotato.subdomain.conf.sample
+++ b/couchpotato.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/couchpotato.subfolder.conf.sample b/couchpotato.subfolder.conf.sample
index 28caa42..7f91056 100644
--- a/couchpotato.subfolder.conf.sample
+++ b/couchpotato.subfolder.conf.sample
@@ -7,7 +7,7 @@ location ^~ /couchpotato {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/deluge.subdomain.conf.sample b/deluge.subdomain.conf.sample
index 74601c4..6f3c6fa 100644
--- a/deluge.subdomain.conf.sample
+++ b/deluge.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/deluge.subfolder.conf.sample b/deluge.subfolder.conf.sample
index 8604189..80eee35 100644
--- a/deluge.subfolder.conf.sample
+++ b/deluge.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /deluge/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/dillinger.subdomain.conf.sample b/dillinger.subdomain.conf.sample
index afdee13..d8758c1 100644
--- a/dillinger.subdomain.conf.sample
+++ b/dillinger.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/documentserver.subdomain.conf.sample b/documentserver.subdomain.conf.sample
index 6d60850..1624040 100644
--- a/documentserver.subdomain.conf.sample
+++ b/documentserver.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         #enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/dokuwiki.subdomain.conf.sample b/dokuwiki.subdomain.conf.sample
index 8bc5695..486d352 100644
--- a/dokuwiki.subdomain.conf.sample
+++ b/dokuwiki.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         #enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/domoticz.subdomain.conf.sample b/domoticz.subdomain.conf.sample
index 2d31de4..4c7bfa7 100644
--- a/domoticz.subdomain.conf.sample
+++ b/domoticz.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/domoticz.subfolder.conf.sample b/domoticz.subfolder.conf.sample
index 978d328..c39d462 100644
--- a/domoticz.subfolder.conf.sample
+++ b/domoticz.subfolder.conf.sample
@@ -7,7 +7,7 @@ location ^~ /domoticz/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/dozzle.subfolder.conf.sample b/dozzle.subfolder.conf.sample
index 4f435fc..919eaaa 100644
--- a/dozzle.subfolder.conf.sample
+++ b/dozzle.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /dozzle/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/duplicati.subdomain.conf.sample b/duplicati.subdomain.conf.sample
index 6e9f6c7..69e8edc 100644
--- a/duplicati.subdomain.conf.sample
+++ b/duplicati.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/duplicati.subfolder.conf.sample b/duplicati.subfolder.conf.sample
index a254b67..0f6dae1 100644
--- a/duplicati.subfolder.conf.sample
+++ b/duplicati.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /duplicati/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/embystat.subdomain.conf.sample b/embystat.subdomain.conf.sample
index 57b87f2..25d34a7 100644
--- a/embystat.subdomain.conf.sample
+++ b/embystat.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/flood.subdomain.conf.sample b/flood.subdomain.conf.sample
index 8c1882b..0118df9 100644
--- a/flood.subdomain.conf.sample
+++ b/flood.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/flood.subfolder.conf.sample b/flood.subfolder.conf.sample
index bf77198..50170ca 100644
--- a/flood.subfolder.conf.sample
+++ b/flood.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /flood/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/foldingathome.subdomain.conf.sample b/foldingathome.subdomain.conf.sample
index d48358c..fbe633a 100644
--- a/foldingathome.subdomain.conf.sample
+++ b/foldingathome.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/freshrss.subdomain.conf.sample b/freshrss.subdomain.conf.sample
index be5dfba..108d41f 100644
--- a/freshrss.subdomain.conf.sample
+++ b/freshrss.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/freshrss.subfolder.conf.sample b/freshrss.subfolder.conf.sample
index f5f3344..e31026e 100644
--- a/freshrss.subfolder.conf.sample
+++ b/freshrss.subfolder.conf.sample
@@ -11,7 +11,7 @@ location ^~ /freshrss/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/ghost.subdomain.conf.sample b/ghost.subdomain.conf.sample
index 5eda845..d91fec6 100644
--- a/ghost.subdomain.conf.sample
+++ b/ghost.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         #enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/ghost.subfolder.conf.sample b/ghost.subfolder.conf.sample
index bb31785..9913ffe 100644
--- a/ghost.subfolder.conf.sample
+++ b/ghost.subfolder.conf.sample
@@ -8,7 +8,7 @@ location /blog {
 
   #enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
   #auth_request /auth;
-  #error_page 401 =200 /login;
+  #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/gitea.subdomain.conf.sample b/gitea.subdomain.conf.sample
index c68b6f2..6fa864a 100644
--- a/gitea.subdomain.conf.sample
+++ b/gitea.subdomain.conf.sample
@@ -27,7 +27,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/glances.subdomain.conf.sample b/glances.subdomain.conf.sample
index 6daf6e4..339c5df 100644
--- a/glances.subdomain.conf.sample
+++ b/glances.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/glances.subfolder.conf.sample b/glances.subfolder.conf.sample
index e964cb8..676656e 100644
--- a/glances.subfolder.conf.sample
+++ b/glances.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /glances/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/gotify.subdomain.conf.sample b/gotify.subdomain.conf.sample
index 10e5e57..ddfb5c2 100644
--- a/gotify.subdomain.conf.sample
+++ b/gotify.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/grafana.subdomain.conf.sample b/grafana.subdomain.conf.sample
index 0645c0d..e82fc91 100644
--- a/grafana.subdomain.conf.sample
+++ b/grafana.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/grocy.subdomain.conf.sample b/grocy.subdomain.conf.sample
index 2bada88..7aa965b 100644
--- a/grocy.subdomain.conf.sample
+++ b/grocy.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/guacamole.subdomain.conf.sample b/guacamole.subdomain.conf.sample
index 681b60a..676b538 100644
--- a/guacamole.subdomain.conf.sample
+++ b/guacamole.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/guacamole.subfolder.conf.sample b/guacamole.subfolder.conf.sample
index 378eb46..ceb34ff 100644
--- a/guacamole.subfolder.conf.sample
+++ b/guacamole.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /guacamole/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/headphones.subdomain.conf.sample b/headphones.subdomain.conf.sample
index 36b5901..7037b48 100644
--- a/headphones.subdomain.conf.sample
+++ b/headphones.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/headphones.subfolder.conf.sample b/headphones.subfolder.conf.sample
index c2e854e..8596105 100644
--- a/headphones.subfolder.conf.sample
+++ b/headphones.subfolder.conf.sample
@@ -7,7 +7,7 @@ location ^~ /headphones {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/heimdall.subdomain.conf.sample b/heimdall.subdomain.conf.sample
index 5773997..a386311 100644
--- a/heimdall.subdomain.conf.sample
+++ b/heimdall.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/heimdall.subfolder.conf.sample b/heimdall.subfolder.conf.sample
index 79ae53f..df1fcd5 100644
--- a/heimdall.subfolder.conf.sample
+++ b/heimdall.subfolder.conf.sample
@@ -7,7 +7,7 @@ location / {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/homeassistant.subdomain.conf.sample b/homeassistant.subdomain.conf.sample
index a5f8adc..1913e44 100644
--- a/homeassistant.subdomain.conf.sample
+++ b/homeassistant.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/jackett.subdomain.conf.sample b/jackett.subdomain.conf.sample
index 4fd1969..984ccda 100644
--- a/jackett.subdomain.conf.sample
+++ b/jackett.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/jackett.subfolder.conf.sample b/jackett.subfolder.conf.sample
index 3ad98ca..8a6935f 100644
--- a/jackett.subfolder.conf.sample
+++ b/jackett.subfolder.conf.sample
@@ -7,7 +7,7 @@ location ^~ /jackett {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/jenkins.subfolder.conf.sample b/jenkins.subfolder.conf.sample
index 6dae4f5..8b3f8c3 100644
--- a/jenkins.subfolder.conf.sample
+++ b/jenkins.subfolder.conf.sample
@@ -11,7 +11,7 @@ location ^~ /jenkins/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/kanzi.subdomain.conf.sample b/kanzi.subdomain.conf.sample
index e60463d..76db525 100644
--- a/kanzi.subdomain.conf.sample
+++ b/kanzi.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/kanzi.subfolder.conf.sample b/kanzi.subfolder.conf.sample
index 1814716..680db1f 100644
--- a/kanzi.subfolder.conf.sample
+++ b/kanzi.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /kanzi/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/lazylibrarian.subdomain.conf.sample b/lazylibrarian.subdomain.conf.sample
index fcb23b4..6b21bbe 100644
--- a/lazylibrarian.subdomain.conf.sample
+++ b/lazylibrarian.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/lazylibrarian.subfolder.conf.sample b/lazylibrarian.subfolder.conf.sample
index 06002b7..d89b2cb 100644
--- a/lazylibrarian.subfolder.conf.sample
+++ b/lazylibrarian.subfolder.conf.sample
@@ -7,7 +7,7 @@ location ^~ /lazylibrarian {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/librespeed.subdomain.conf.sample b/librespeed.subdomain.conf.sample
index 8864afe..6d3f21d 100644
--- a/librespeed.subdomain.conf.sample
+++ b/librespeed.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/lidarr.subdomain.conf.sample b/lidarr.subdomain.conf.sample
index 452798e..9c01fe2 100644
--- a/lidarr.subdomain.conf.sample
+++ b/lidarr.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/lidarr.subfolder.conf.sample b/lidarr.subfolder.conf.sample
index a27a07f..d580f89 100644
--- a/lidarr.subfolder.conf.sample
+++ b/lidarr.subfolder.conf.sample
@@ -7,7 +7,7 @@ location ^~ /lidarr {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/lychee.subdomain.conf.sample b/lychee.subdomain.conf.sample
index b18e8b0..dc90f55 100644
--- a/lychee.subdomain.conf.sample
+++ b/lychee.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/mailu.subdomain.conf.sample b/mailu.subdomain.conf.sample
index 5108d3e..5536247 100644
--- a/mailu.subdomain.conf.sample
+++ b/mailu.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/mailu.subfolder.conf.sample b/mailu.subfolder.conf.sample
index 1e664f4..2c84712 100644
--- a/mailu.subfolder.conf.sample
+++ b/mailu.subfolder.conf.sample
@@ -13,7 +13,7 @@ location ^~ /admin/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
@@ -37,7 +37,7 @@ location ^~ /webmail/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/medusa.subdomain.conf.sample b/medusa.subdomain.conf.sample
index c8d1f38..32d4a93 100644
--- a/medusa.subdomain.conf.sample
+++ b/medusa.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/medusa.subfolder.conf.sample b/medusa.subfolder.conf.sample
index 1deb9f0..049f857 100644
--- a/medusa.subfolder.conf.sample
+++ b/medusa.subfolder.conf.sample
@@ -7,7 +7,7 @@ location ^~ /medusa {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/miniflux.subdomain.conf.sample b/miniflux.subdomain.conf.sample
index b9ac4c3..576f631 100644
--- a/miniflux.subdomain.conf.sample
+++ b/miniflux.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/miniflux.subfolder.conf.sample b/miniflux.subfolder.conf.sample
index 90f2f5a..8da4e45 100644
--- a/miniflux.subfolder.conf.sample
+++ b/miniflux.subfolder.conf.sample
@@ -11,7 +11,7 @@ location /miniflux/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/monitorr.subdomain.conf.sample b/monitorr.subdomain.conf.sample
index fe12d2a..e494f03 100644
--- a/monitorr.subdomain.conf.sample
+++ b/monitorr.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/monitorr.subfolder.conf.sample b/monitorr.subfolder.conf.sample
index c93d98e..d291e32 100644
--- a/monitorr.subfolder.conf.sample
+++ b/monitorr.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /monitorr/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/mstream.subdomain.conf.sample b/mstream.subdomain.conf.sample
index 4f5d8d7..0154e09 100644
--- a/mstream.subdomain.conf.sample
+++ b/mstream.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/mylar.subdomain.conf.sample b/mylar.subdomain.conf.sample
index f6a82c4..0099efb 100644
--- a/mylar.subdomain.conf.sample
+++ b/mylar.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/mylar.subfolder.conf.sample b/mylar.subfolder.conf.sample
index 307e998..fcbe861 100644
--- a/mylar.subfolder.conf.sample
+++ b/mylar.subfolder.conf.sample
@@ -7,7 +7,7 @@ location ^~ /mylar {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/mytinytodo.subfolder.conf.sample b/mytinytodo.subfolder.conf.sample
index 18917af..fbfbb8b 100644
--- a/mytinytodo.subfolder.conf.sample
+++ b/mytinytodo.subfolder.conf.sample
@@ -12,7 +12,7 @@ location ^~ /todo/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/netboot.subdomain.conf.sample b/netboot.subdomain.conf.sample
index 0b4ddfd..2b086c0 100644
--- a/netboot.subdomain.conf.sample
+++ b/netboot.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/netdata.subdomain.conf.sample b/netdata.subdomain.conf.sample
index 88e12eb..a4cd8a0 100644
--- a/netdata.subdomain.conf.sample
+++ b/netdata.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/netdata.subfolder.conf.sample b/netdata.subfolder.conf.sample
index a6794ca..4eeb35c 100644
--- a/netdata.subfolder.conf.sample
+++ b/netdata.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /netdata/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/nzbget.subdomain.conf.sample b/nzbget.subdomain.conf.sample
index 3e69158..01d21b6 100644
--- a/nzbget.subdomain.conf.sample
+++ b/nzbget.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/nzbget.subfolder.conf.sample b/nzbget.subfolder.conf.sample
index e48d176..93c332b 100644
--- a/nzbget.subfolder.conf.sample
+++ b/nzbget.subfolder.conf.sample
@@ -7,7 +7,7 @@ location /nzbget {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/nzbhydra.subdomain.conf.sample b/nzbhydra.subdomain.conf.sample
index 1d868f4..3b54538 100644
--- a/nzbhydra.subdomain.conf.sample
+++ b/nzbhydra.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/nzbhydra.subfolder.conf.sample b/nzbhydra.subfolder.conf.sample
index 23f189c..f32d06e 100644
--- a/nzbhydra.subfolder.conf.sample
+++ b/nzbhydra.subfolder.conf.sample
@@ -7,7 +7,7 @@ location ^~ /nzbhydra {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/ombi.subdomain.conf.sample b/ombi.subdomain.conf.sample
index 7afa6f5..3939d61 100644
--- a/ombi.subdomain.conf.sample
+++ b/ombi.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/ombi.subfolder.conf.sample b/ombi.subfolder.conf.sample
index bc46bb6..a433387 100644
--- a/ombi.subfolder.conf.sample
+++ b/ombi.subfolder.conf.sample
@@ -11,7 +11,7 @@ location ^~ /ombi/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/openvpn-as.subdomain.conf.sample b/openvpn-as.subdomain.conf.sample
index e4e5ab6..6097308 100644
--- a/openvpn-as.subdomain.conf.sample
+++ b/openvpn-as.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
@@ -44,7 +44,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/organizr.subdomain.conf.sample b/organizr.subdomain.conf.sample
index a7d981b..4407c6c 100644
--- a/organizr.subdomain.conf.sample
+++ b/organizr.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/organizr.subfolder.conf.sample b/organizr.subfolder.conf.sample
index adc2f9c..e68ef35 100644
--- a/organizr.subfolder.conf.sample
+++ b/organizr.subfolder.conf.sample
@@ -7,7 +7,7 @@ location / {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/osticket.subdomain.conf.sample b/osticket.subdomain.conf.sample
index 665f177..142212f 100644
--- a/osticket.subdomain.conf.sample
+++ b/osticket.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/phpmyadmin.subdomain.conf.sample b/phpmyadmin.subdomain.conf.sample
index 1ba1218..12bf8be 100644
--- a/phpmyadmin.subdomain.conf.sample
+++ b/phpmyadmin.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/phpmyadmin.subfolder.conf.sample b/phpmyadmin.subfolder.conf.sample
index a105038..233eae3 100644
--- a/phpmyadmin.subfolder.conf.sample
+++ b/phpmyadmin.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /phpmyadmin/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/pihole.subdomain.conf.sample b/pihole.subdomain.conf.sample
index 2396d79..13fac51 100644
--- a/pihole.subdomain.conf.sample
+++ b/pihole.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
@@ -45,7 +45,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/pihole.subfolder.conf.sample b/pihole.subfolder.conf.sample
index aa21ab0..45d6b1d 100644
--- a/pihole.subfolder.conf.sample
+++ b/pihole.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /pihole/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
@@ -36,7 +36,7 @@ location ^~ /pihole/admin/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/piwigo.subdomain.conf.sample b/piwigo.subdomain.conf.sample
index 6a24a11..7b79233 100644
--- a/piwigo.subdomain.conf.sample
+++ b/piwigo.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/plex.subdomain.conf.sample b/plex.subdomain.conf.sample
index 5ee4c4b..7fe06bc 100644
--- a/plex.subdomain.conf.sample
+++ b/plex.subdomain.conf.sample
@@ -28,7 +28,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/plex.subfolder.conf.sample b/plex.subfolder.conf.sample
index ca12263..22d37a9 100644
--- a/plex.subfolder.conf.sample
+++ b/plex.subfolder.conf.sample
@@ -16,7 +16,7 @@ location ^~ /plex/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/plexwebtools.subdomain.conf.sample b/plexwebtools.subdomain.conf.sample
index cd53f10..6e63e15 100644
--- a/plexwebtools.subdomain.conf.sample
+++ b/plexwebtools.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/plexwebtools.subfolder.conf.sample b/plexwebtools.subfolder.conf.sample
index 72b9339..cb9974d 100644
--- a/plexwebtools.subfolder.conf.sample
+++ b/plexwebtools.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /plexwebtools/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/portainer.subdomain.conf.sample b/portainer.subdomain.conf.sample
index da6e7c2..af9b93f 100644
--- a/portainer.subdomain.conf.sample
+++ b/portainer.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
@@ -46,7 +46,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/portainer.subfolder.conf.sample b/portainer.subfolder.conf.sample
index dc3f49d..fdc762c 100644
--- a/portainer.subfolder.conf.sample
+++ b/portainer.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /portainer/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/prometheus.subdomain.conf.sample b/prometheus.subdomain.conf.sample
index 60c0ff8..c8b11aa 100644
--- a/prometheus.subdomain.conf.sample
+++ b/prometheus.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/pydio-cells.subdomain.conf.sample b/pydio-cells.subdomain.conf.sample
index deb639b..923f28a 100644
--- a/pydio-cells.subdomain.conf.sample
+++ b/pydio-cells.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
@@ -43,7 +43,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/pydio.subdomain.conf.sample b/pydio.subdomain.conf.sample
index 0c64614..c512755 100644
--- a/pydio.subdomain.conf.sample
+++ b/pydio.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/pyload.subdomain.conf.sample b/pyload.subdomain.conf.sample
index 7f9b6d3..5a2147d 100644
--- a/pyload.subdomain.conf.sample
+++ b/pyload.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/qbittorrent.subdomain.conf.sample b/qbittorrent.subdomain.conf.sample
index 432add4..201009a 100644
--- a/qbittorrent.subdomain.conf.sample
+++ b/qbittorrent.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/qbittorrent.subfolder.conf.sample b/qbittorrent.subfolder.conf.sample
index ef1aa89..f0886fd 100644
--- a/qbittorrent.subfolder.conf.sample
+++ b/qbittorrent.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /qbittorrent/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/quassel-web.subdomain.conf.sample b/quassel-web.subdomain.conf.sample
index 0eeb0d0..e73df21 100644
--- a/quassel-web.subdomain.conf.sample
+++ b/quassel-web.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/quassel-web.subfolder.conf.sample b/quassel-web.subfolder.conf.sample
index 4748d50..2554d37 100644
--- a/quassel-web.subfolder.conf.sample
+++ b/quassel-web.subfolder.conf.sample
@@ -8,7 +8,7 @@ location ^~ /quassel {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/radarr.subdomain.conf.sample b/radarr.subdomain.conf.sample
index d32e1bf..98ca06f 100644
--- a/radarr.subdomain.conf.sample
+++ b/radarr.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/radarr.subfolder.conf.sample b/radarr.subfolder.conf.sample
index 4a19bb2..1de4c03 100644
--- a/radarr.subfolder.conf.sample
+++ b/radarr.subfolder.conf.sample
@@ -7,7 +7,7 @@ location ^~ /radarr {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/raneto.subdomain.conf.sample b/raneto.subdomain.conf.sample
index 2d7bc76..e591719 100644
--- a/raneto.subdomain.conf.sample
+++ b/raneto.subdomain.conf.sample
@@ -22,7 +22,7 @@ server {
 
         #enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/requestrr.subdomain.conf.sample b/requestrr.subdomain.conf.sample
index e63d26f..8732c76 100644
--- a/requestrr.subdomain.conf.sample
+++ b/requestrr.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/resilio-sync.subdomain.conf.sample b/resilio-sync.subdomain.conf.sample
index 9d30f0b..8960bef 100644
--- a/resilio-sync.subdomain.conf.sample
+++ b/resilio-sync.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/rutorrent.subdomain.conf.sample b/rutorrent.subdomain.conf.sample
index e5cab0e..c7ed27a 100644
--- a/rutorrent.subdomain.conf.sample
+++ b/rutorrent.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/rutorrent.subfolder.conf.sample b/rutorrent.subfolder.conf.sample
index 069da2d..0ec949d 100644
--- a/rutorrent.subfolder.conf.sample
+++ b/rutorrent.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /rutorrent/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/sabnzbd.subdomain.conf.sample b/sabnzbd.subdomain.conf.sample
index 2f334aa..a8a2801 100644
--- a/sabnzbd.subdomain.conf.sample
+++ b/sabnzbd.subdomain.conf.sample
@@ -25,7 +25,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/sabnzbd.subfolder.conf.sample b/sabnzbd.subfolder.conf.sample
index 2ce4e92..1c2fd2e 100644
--- a/sabnzbd.subfolder.conf.sample
+++ b/sabnzbd.subfolder.conf.sample
@@ -7,7 +7,7 @@ location ^~ /sabnzbd {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/scope.subfolder.conf.sample b/scope.subfolder.conf.sample
index e48bede..7bc6b9f 100644
--- a/scope.subfolder.conf.sample
+++ b/scope.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /scope/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/sickrage.subdomain.conf.sample b/sickrage.subdomain.conf.sample
index eaf981d..8eef084 100644
--- a/sickrage.subdomain.conf.sample
+++ b/sickrage.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/sickrage.subfolder.conf.sample b/sickrage.subfolder.conf.sample
index 382c6cf..e82add9 100644
--- a/sickrage.subfolder.conf.sample
+++ b/sickrage.subfolder.conf.sample
@@ -7,7 +7,7 @@ location ^~ /sickrage {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/smokeping.subdomain.conf.sample b/smokeping.subdomain.conf.sample
index 3178d6b..e21a337 100644
--- a/smokeping.subdomain.conf.sample
+++ b/smokeping.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/smokeping.subfolder.conf.sample b/smokeping.subfolder.conf.sample
index 381e6ce..7da8b68 100644
--- a/smokeping.subfolder.conf.sample
+++ b/smokeping.subfolder.conf.sample
@@ -7,7 +7,7 @@ location ^~ /smokeping {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/sonarr.subdomain.conf.sample b/sonarr.subdomain.conf.sample
index c3bc803..9d9f104 100644
--- a/sonarr.subdomain.conf.sample
+++ b/sonarr.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/sonarr.subfolder.conf.sample b/sonarr.subfolder.conf.sample
index 2c73446..6e54e7c 100644
--- a/sonarr.subfolder.conf.sample
+++ b/sonarr.subfolder.conf.sample
@@ -7,7 +7,7 @@ location ^~ /sonarr {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/statping.subdomain.conf.sample b/statping.subdomain.conf.sample
index 56ef96d..e73d54e 100644
--- a/statping.subdomain.conf.sample
+++ b/statping.subdomain.conf.sample
@@ -25,7 +25,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/synclounge.subdomain.conf.sample b/synclounge.subdomain.conf.sample
index 3a7a23f..1ef22a6 100644
--- a/synclounge.subdomain.conf.sample
+++ b/synclounge.subdomain.conf.sample
@@ -28,7 +28,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/synclounge.subfolder.conf.sample b/synclounge.subfolder.conf.sample
index 77eefeb..095f00e 100644
--- a/synclounge.subfolder.conf.sample
+++ b/synclounge.subfolder.conf.sample
@@ -41,7 +41,7 @@ location /slweb {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/syncthing.subdomain.conf.sample b/syncthing.subdomain.conf.sample
index 259eb13..6810af3 100644
--- a/syncthing.subdomain.conf.sample
+++ b/syncthing.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/taisun.subdomain.conf.sample b/taisun.subdomain.conf.sample
index 1dac9c5..5eb7dc4 100644
--- a/taisun.subdomain.conf.sample
+++ b/taisun.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/tautulli.subdomain.conf.sample b/tautulli.subdomain.conf.sample
index fe053c9..90e4b95 100644
--- a/tautulli.subdomain.conf.sample
+++ b/tautulli.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/tautulli.subfolder.conf.sample b/tautulli.subfolder.conf.sample
index 45abc7a..cca53b1 100644
--- a/tautulli.subfolder.conf.sample
+++ b/tautulli.subfolder.conf.sample
@@ -7,7 +7,7 @@ location ^~ /tautulli {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/tdarr.subdomain.conf.sample b/tdarr.subdomain.conf.sample
index df24656..22afa09 100644
--- a/tdarr.subdomain.conf.sample
+++ b/tdarr.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/thelounge.subdomain.conf.sample b/thelounge.subdomain.conf.sample
index 41a6d39..9461cf2 100644
--- a/thelounge.subdomain.conf.sample
+++ b/thelounge.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/thelounge.subfolder.conf.sample b/thelounge.subfolder.conf.sample
index 23bebda..6520630 100644
--- a/thelounge.subfolder.conf.sample
+++ b/thelounge.subfolder.conf.sample
@@ -10,7 +10,7 @@ location ^~ /thelounge/ {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/transmission.subdomain.conf.sample b/transmission.subdomain.conf.sample
index 625ff67..febbe02 100644
--- a/transmission.subdomain.conf.sample
+++ b/transmission.subdomain.conf.sample
@@ -33,7 +33,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/transmission.subfolder.conf.sample b/transmission.subfolder.conf.sample
index 24a1898..39813c3 100644
--- a/transmission.subfolder.conf.sample
+++ b/transmission.subfolder.conf.sample
@@ -17,7 +17,7 @@ location ^~ /transmission {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/tt-rss.subdomain.conf.sample b/tt-rss.subdomain.conf.sample
index 0d5131b..57e788a 100644
--- a/tt-rss.subdomain.conf.sample
+++ b/tt-rss.subdomain.conf.sample
@@ -24,7 +24,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/ubooquity.subdomain.conf.sample b/ubooquity.subdomain.conf.sample
index 523d77e..4b953e6 100644
--- a/ubooquity.subdomain.conf.sample
+++ b/ubooquity.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/ubooquity.subfolder.conf.sample b/ubooquity.subfolder.conf.sample
index 8cb29de..9143e7c 100644
--- a/ubooquity.subfolder.conf.sample
+++ b/ubooquity.subfolder.conf.sample
@@ -7,7 +7,7 @@
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
diff --git a/unifi-controller.subdomain.conf.sample b/unifi-controller.subdomain.conf.sample
index 14b9d5a..5993fd7 100644
--- a/unifi-controller.subdomain.conf.sample
+++ b/unifi-controller.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
@@ -44,7 +44,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/znc.subdomain.conf.sample b/znc.subdomain.conf.sample
index 542eb10..9ddc3bd 100644
--- a/znc.subdomain.conf.sample
+++ b/znc.subdomain.conf.sample
@@ -23,7 +23,7 @@ server {
 
         # enable the next two lines for ldap auth
         #auth_request /auth;
-        #error_page 401 =200 /login;
+        #error_page 401 =200 /ldaplogin;
 
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
diff --git a/znc.subfolder.conf.sample b/znc.subfolder.conf.sample
index 160c3d0..db33450 100644
--- a/znc.subfolder.conf.sample
+++ b/znc.subfolder.conf.sample
@@ -7,7 +7,7 @@ location /znc {
 
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
-    #error_page 401 =200 /login;
+    #error_page 401 =200 /ldaplogin;
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;

From 605bd5a2a9419da240c567342f892e018eba1a1d Mon Sep 17 00:00:00 2001
From: Sander <github@golles.nl>
Date: Thu, 4 Jun 2020 11:13:49 +0200
Subject: [PATCH 108/126] include proxy.conf in portainer subdomain config

---
 portainer.subdomain.conf.sample | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/portainer.subdomain.conf.sample b/portainer.subdomain.conf.sample
index af9b93f..676d004 100644
--- a/portainer.subdomain.conf.sample
+++ b/portainer.subdomain.conf.sample
@@ -28,6 +28,7 @@ server {
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
 
+        include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app portainer;
         set $upstream_port 9000;
@@ -35,7 +36,6 @@ server {
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
         proxy_set_header Connection "";
-        proxy_http_version 1.1;
         proxy_hide_header X-Frame-Options; # Possibly nott needed after Portainer 1.20.0
     }
 
@@ -51,6 +51,7 @@ server {
         # enable for Authelia
         #include /config/nginx/authelia-location.conf;
 
+        include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app portainer;
         set $upstream_port 9000;
@@ -59,7 +60,6 @@ server {
 
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
-        proxy_http_version 1.1;
         proxy_hide_header X-Frame-Options; # Possibly nott needed after Portainer 1.20.0
     }
 }

From c1675f422f163e10b6e7f2737d0cd862b7f735f4 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Thu, 4 Jun 2020 17:49:30 -0400
Subject: [PATCH 109/126] Bookstack: add missing config lines

---
 bookstack.subdomain.conf.sample | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bookstack.subdomain.conf.sample b/bookstack.subdomain.conf.sample
index aecaacd..b63186a 100644
--- a/bookstack.subdomain.conf.sample
+++ b/bookstack.subdomain.conf.sample
@@ -12,6 +12,12 @@ server {
 
     client_max_body_size 0;
 
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
     location / {
         #enable the next two lines for http auth
         #auth_basic "Restricted";

From 1ebf4c62659a8cf76c706cc8159780bd55be0e7a Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Fri, 5 Jun 2020 14:09:41 -0400
Subject: [PATCH 110/126] freshrss: remove header that leads to bad request

---
 freshrss.subdomain.conf.sample | 1 -
 freshrss.subfolder.conf.sample | 1 -
 2 files changed, 2 deletions(-)

diff --git a/freshrss.subdomain.conf.sample b/freshrss.subdomain.conf.sample
index 108d41f..1b411b2 100644
--- a/freshrss.subdomain.conf.sample
+++ b/freshrss.subdomain.conf.sample
@@ -37,7 +37,6 @@ server {
 
         proxy_redirect off;
         proxy_buffering off;
-        proxy_set_header Host $host;
         proxy_set_header X-Forwarded-Port $server_port;
         proxy_cookie_path / "/; HTTPOnly; Secure";
         proxy_set_header Authorization $http_authorization;
diff --git a/freshrss.subfolder.conf.sample b/freshrss.subfolder.conf.sample
index e31026e..a04078d 100644
--- a/freshrss.subfolder.conf.sample
+++ b/freshrss.subfolder.conf.sample
@@ -26,7 +26,6 @@ location ^~ /freshrss/ {
     rewrite /freshrss(.*) $1 break;
     proxy_redirect off;
     proxy_buffering off;
-    proxy_set_header Host $host;
     proxy_set_header X-Forwarded-Port $server_port;
     proxy_cookie_path / "/; HTTPOnly; Secure";
     proxy_set_header Authorization $http_authorization;

From 34b1bd7bcde56388ba4caa12a17bbc6209b1da99 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Sat, 20 Jun 2020 16:03:29 -0400
Subject: [PATCH 111/126] adguard: bypass auth for api calls

---
 adguard.subdomain.conf.sample | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/adguard.subdomain.conf.sample b/adguard.subdomain.conf.sample
index 8fed7bb..0f2d7df 100644
--- a/adguard.subdomain.conf.sample
+++ b/adguard.subdomain.conf.sample
@@ -36,4 +36,14 @@ server {
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
     }
+
+    location /control {
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_app adguard;
+        set $upstream_port 80;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+        
+    }
 }

From 410af4d3515d2ad03ca62c4b198604af2d73fed4 Mon Sep 17 00:00:00 2001
From: Dovry <beepboopvm@gmail.com>
Date: Tue, 23 Jun 2020 14:32:34 +0200
Subject: [PATCH 112/126] Create dozzle.subdomain.conf.sample

---
 dozzle.subdomain.conf.sample | 39 ++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 dozzle.subdomain.conf.sample

diff --git a/dozzle.subdomain.conf.sample b/dozzle.subdomain.conf.sample
new file mode 100644
index 0000000..0484d55
--- /dev/null
+++ b/dozzle.subdomain.conf.sample
@@ -0,0 +1,39 @@
+# make sure that your dns has a cname set for dozzle and that your dozzle container is named dozzle
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name dozzle.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # enable the next two lines for ldap auth
+        #auth_request /auth;
+        #error_page 401 =200 /ldaplogin;
+
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_app dozzle;
+        set $upstream_port 8080;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+    }
+}

From 26bb5cfd1fbb331e2d6fedbb01d23e8b63a5697e Mon Sep 17 00:00:00 2001
From: blackerking <2019363+blackerking@users.noreply.github.com>
Date: Tue, 23 Jun 2020 20:49:55 +0200
Subject: [PATCH 113/126] Create youtube-dl.subfolder.conf

---
 youtube-dl.subfolder.conf | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 youtube-dl.subfolder.conf

diff --git a/youtube-dl.subfolder.conf b/youtube-dl.subfolder.conf
new file mode 100644
index 0000000..addd5e4
--- /dev/null
+++ b/youtube-dl.subfolder.conf
@@ -0,0 +1,27 @@
+# Works with this youtube-dl Fork: https://github.com/nbr23/youtube-dl-server
+
+location /youtube-dl {
+    return 301 $scheme://$host/youtube-dl/;
+}
+location ^~ /youtube-dl/ {
+    # enable the next two lines for http auth
+    #auth_basic "Restricted";
+    #auth_basic_user_file /config/nginx/.htpasswd;
+
+    # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
+    #auth_request /auth;
+    #error_page 401 =200 /login;
+	
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_app  youtube-dl-server;
+    set $upstream_port 8080;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+	  proxy_redirect  off;
+	
+	  rewrite /youtube-dl(.*) $1 break;
+	
+	  proxy_set_header Referer '';
+    proxy_set_header Host $upstream_app:8080;
+}

From 0544a8b7f433144d38f7e51484f2138e75133b98 Mon Sep 17 00:00:00 2001
From: blackerking <2019363+blackerking@users.noreply.github.com>
Date: Tue, 23 Jun 2020 21:08:47 +0200
Subject: [PATCH 114/126] Update youtube-dl.subfolder.conf

changed the freespace between lines
---
 youtube-dl.subfolder.conf | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/youtube-dl.subfolder.conf b/youtube-dl.subfolder.conf
index addd5e4..184496a 100644
--- a/youtube-dl.subfolder.conf
+++ b/youtube-dl.subfolder.conf
@@ -3,6 +3,7 @@
 location /youtube-dl {
     return 301 $scheme://$host/youtube-dl/;
 }
+
 location ^~ /youtube-dl/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
@@ -18,10 +19,10 @@ location ^~ /youtube-dl/ {
     set $upstream_port 8080;
     set $upstream_proto http;
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
-	  proxy_redirect  off;
+    proxy_redirect  off;
 	
-	  rewrite /youtube-dl(.*) $1 break;
+    rewrite /youtube-dl(.*) $1 break;
 	
-	  proxy_set_header Referer '';
+    proxy_set_header Referer '';
     proxy_set_header Host $upstream_app:8080;
 }

From 10a0b73f28391bec8c911b156028f84acf871e5f Mon Sep 17 00:00:00 2001
From: Cory Evans <cory0x45@gmail.com>
Date: Sun, 28 Jun 2020 16:02:59 +1200
Subject: [PATCH 115/126] renamed youtube-dl.subfolder.conf ->
 youtube-dl.subfolder.conf.sample

---
 youtube-dl.subfolder.conf => youtube-dl.subfolder.conf.sample | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename youtube-dl.subfolder.conf => youtube-dl.subfolder.conf.sample (100%)

diff --git a/youtube-dl.subfolder.conf b/youtube-dl.subfolder.conf.sample
similarity index 100%
rename from youtube-dl.subfolder.conf
rename to youtube-dl.subfolder.conf.sample

From d358b93123214d2ac84d6d53d595962b7479a5ec Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Mon, 29 Jun 2020 11:06:35 -0500
Subject: [PATCH 116/126] Create allowed_names.yml

---
 .github/workflows/allowed_names.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 .github/workflows/allowed_names.yml

diff --git a/.github/workflows/allowed_names.yml b/.github/workflows/allowed_names.yml
new file mode 100644
index 0000000..20e3c5b
--- /dev/null
+++ b/.github/workflows/allowed_names.yml
@@ -0,0 +1,24 @@
+name: Check Allowed File Names
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  Check Allowed File Names:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Check Allowed File Names
+      run: |
+        NOT_SAMPLES=$(find . -not -path '*/\.*' -type f ! \( -name '*.sample' -o -name 'README.md' -o -name 'LICENSE' \))
+        NOT_SAMPLES_COUNT=$(echo "${NOT_SAMPLES}" | wc -w)
+        if (( NOT_SAMPLES_COUNT > 0 )); then
+            echo "The following files are not allowed:"
+            echo "${NOT_SAMPLES}"
+            exit 1
+        fi

From c0ea6e751d781eb379962e3e050409445bded9aa Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Mon, 29 Jun 2020 11:10:45 -0500
Subject: [PATCH 117/126] Update allowed_names.yml

---
 .github/workflows/allowed_names.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/allowed_names.yml b/.github/workflows/allowed_names.yml
index 20e3c5b..73214f8 100644
--- a/.github/workflows/allowed_names.yml
+++ b/.github/workflows/allowed_names.yml
@@ -15,7 +15,7 @@ jobs:
 
     - name: Check Allowed File Names
       run: |
-        NOT_SAMPLES=$(find . -not -path '*/\.*' -type f ! \( -name '*.sample' -o -name 'README.md' -o -name 'LICENSE' \))
+        NOT_SAMPLES=$(find . -not -path '*/\.*' -type f ! \( -name '*.conf.sample' -o -name 'README.md' -o -name 'LICENSE' \))
         NOT_SAMPLES_COUNT=$(echo "${NOT_SAMPLES}" | wc -w)
         if (( NOT_SAMPLES_COUNT > 0 )); then
             echo "The following files are not allowed:"

From f8bce1040da405c49e15434acf68a0edc81ed2d9 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Mon, 29 Jun 2020 11:13:17 -0500
Subject: [PATCH 118/126] Update allowed_names.yml

---
 .github/workflows/allowed_names.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/allowed_names.yml b/.github/workflows/allowed_names.yml
index 73214f8..b32fad8 100644
--- a/.github/workflows/allowed_names.yml
+++ b/.github/workflows/allowed_names.yml
@@ -7,7 +7,7 @@ on:
     branches: [ master ]
 
 jobs:
-  Check Allowed File Names:
+  check-allowed-file-names:
     runs-on: ubuntu-latest
 
     steps:

From d6acc292f0a11c4fb1810c978590ddd2bbc13d76 Mon Sep 17 00:00:00 2001
From: miigotu <miigotu@gmail.com>
Date: Fri, 3 Jul 2020 02:37:38 -0400
Subject: [PATCH 119/126] Add SickChill examples for subdomain and subfolder

Signed-off-by: miigotu <miigotu@gmail.com>
---
 sickchill.subdomain.conf.sample | 43 +++++++++++++++++++++++++++++++++
 sickchill.subfolder.conf.sample | 27 +++++++++++++++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 sickchill.subdomain.conf.sample
 create mode 100644 sickchill.subfolder.conf.sample

diff --git a/sickchill.subdomain.conf.sample b/sickchill.subdomain.conf.sample
new file mode 100644
index 0000000..a69295a
--- /dev/null
+++ b/sickchill.subdomain.conf.sample
@@ -0,0 +1,43 @@
+sickchill.subdomain.conf.sample# make sure that your dns has a cname set for sickchill
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
+    server_name sickchill.*;
+
+    include /config/nginx/ssl.conf;
+
+    client_max_body_size 0;
+
+    # enable for ldap auth, fill in ldap details in ldap.conf
+    #include /config/nginx/ldap.conf;
+
+    # enable for Authelia
+    #include /config/nginx/authelia-server.conf;
+
+    location / {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # enable the next two lines for ldap auth
+        #auth_request /auth;
+        #error_page 401 =200 /ldaplogin;
+
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_app sickchill;
+        set $upstream_port 8081;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}
diff --git a/sickchill.subfolder.conf.sample b/sickchill.subfolder.conf.sample
new file mode 100644
index 0000000..44e9c9d
--- /dev/null
+++ b/sickchill.subfolder.conf.sample
@@ -0,0 +1,27 @@
+# first stop the sickchill container and edit the config.ini for sickchill and set web_root to /sickchill and then start the sickchill container
+
+location ^~ /sickchill {
+    # enable the next two lines for http auth
+    #auth_basic "Restricted";
+    #auth_basic_user_file /config/nginx/.htpasswd;
+
+    # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
+    #auth_request /auth;
+    #error_page 401 =200 /ldaplogin;
+
+    # enable for Authelia, also enable authelia-server.conf in the default site config
+    #include /config/nginx/authelia-location.conf;
+
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_app sickchill;
+    set $upstream_port 8081;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+    proxy_set_header Host $http_host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_set_header X-Forwarded-Proto $scheme;
+
+}

From 06fe8f71fede18d4c6b4cff1e55c68b48314b286 Mon Sep 17 00:00:00 2001
From: miigotu <miigotu@gmail.com>
Date: Fri, 3 Jul 2020 21:21:58 -0400
Subject: [PATCH 120/126] Update sickchill.subdomain.conf.sample

---
 sickchill.subdomain.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sickchill.subdomain.conf.sample b/sickchill.subdomain.conf.sample
index a69295a..67802c8 100644
--- a/sickchill.subdomain.conf.sample
+++ b/sickchill.subdomain.conf.sample
@@ -1,4 +1,4 @@
-sickchill.subdomain.conf.sample# make sure that your dns has a cname set for sickchill
+# make sure that your dns has a cname set for sickchill
 
 server {
     listen 443 ssl;

From 0478e2d3c5bf3e5267706b77101909fdfc8e515a Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Sun, 2 Aug 2020 17:18:01 -0400
Subject: [PATCH 121/126] bazarr updates to fix api access on new gui (ajax)

---
 bazarr.subdomain.conf.sample | 14 ++++++++++++++
 bazarr.subfolder.conf.sample | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/bazarr.subdomain.conf.sample b/bazarr.subdomain.conf.sample
index 8c6a276..8a439be 100644
--- a/bazarr.subdomain.conf.sample
+++ b/bazarr.subdomain.conf.sample
@@ -35,5 +35,19 @@ server {
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+    }
+
+    location ~ (/bazarr)?/api {
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_app bazarr;
+        set $upstream_port 6767;
+        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/bazarr.subfolder.conf.sample b/bazarr.subfolder.conf.sample
index 0a5d11c..ce306d2 100644
--- a/bazarr.subfolder.conf.sample
+++ b/bazarr.subfolder.conf.sample
@@ -22,4 +22,18 @@ location ^~ /bazarr/ {
     set $upstream_proto http;
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "Upgrade";
+}
+
+location ^~ /bazarr/api {
+    include /config/nginx/proxy.conf;
+    resolver 127.0.0.11 valid=30s;
+    set $upstream_app bazarr;
+    set $upstream_port 6767;
+    set $upstream_proto http;
+    proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection "Upgrade";
 }

From c25c306e25835eb9cfbbac4b830f148766259577 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Fri, 7 Aug 2020 11:39:03 -0400
Subject: [PATCH 122/126] code-server: enable sub-subdomain proxy

---
 code-server.subdomain.conf.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code-server.subdomain.conf.sample b/code-server.subdomain.conf.sample
index e45708b..412df4c 100644
--- a/code-server.subdomain.conf.sample
+++ b/code-server.subdomain.conf.sample
@@ -4,7 +4,7 @@ server {
     listen 443 ssl;
     listen [::]:443 ssl;
 
-    server_name code-server.*;
+    server_name code-server.* "~^[0-9]{1,10}\.code-server\..*$";
 
     include /config/nginx/ssl.conf;
 

From 1e8b39fcbf6fa2246360a38888828fd51ada62ee Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Wed, 19 Aug 2020 11:35:50 -0400
Subject: [PATCH 123/126] nextcloud: change to swag

---
 nextcloud.subdomain.conf.sample | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud.subdomain.conf.sample b/nextcloud.subdomain.conf.sample
index ab2281c..16c7285 100644
--- a/nextcloud.subdomain.conf.sample
+++ b/nextcloud.subdomain.conf.sample
@@ -1,7 +1,7 @@
 # make sure that your dns has a cname set for nextcloud
-# assuming this container is called "letsencrypt", edit your nextcloud container's config
+# assuming this container is called "swag", edit your nextcloud container's config
 # located at /config/www/nextcloud/config/config.php and add the following lines before the ");":
-#  'trusted_proxies' => ['letsencrypt'],
+#  'trusted_proxies' => ['swag'],
 #  'overwrite.cli.url' => 'https://nextcloud.your-domain.com/',
 #  'overwritehost' => 'nextcloud.your-domain.com',
 #  'overwriteprotocol' => 'https',

From e4b6dae239045b756a3205233ecec3238dfea130 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@users.noreply.github.com>
Date: Wed, 19 Aug 2020 11:36:26 -0400
Subject: [PATCH 124/126] nextcloud: change to swag (subfolder)

---
 nextcloud.subfolder.conf.sample | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nextcloud.subfolder.conf.sample b/nextcloud.subfolder.conf.sample
index 7b14687..2ee4393 100644
--- a/nextcloud.subfolder.conf.sample
+++ b/nextcloud.subfolder.conf.sample
@@ -1,6 +1,6 @@
-# Assuming this container is called "letsencrypt", edit your nextcloud container's config
+# Assuming this container is called "swag", edit your nextcloud container's config
 # located at /config/www/nextcloud/config/config.php and add the following lines before the ");":
-#  'trusted_proxies' => ['letsencrypt'],
+#  'trusted_proxies' => ['swag'],
 #  'overwritewebroot' => '/nextcloud',
 #  'overwrite.cli.url' => 'https://your-domain.com/nextcloud',
 #

From 54ede409381b58e6b13d310fa9af623f42948072 Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Tue, 1 Sep 2020 11:56:42 -0500
Subject: [PATCH 125/126] Cleanup redundant headers from proxy.conf Also
 general cleanup of whitespace

---
 adguard.subdomain.conf.sample          |  2 +-
 adminer.subfolder.conf.sample          |  1 +
 bazarr.subdomain.conf.sample           |  4 ----
 bazarr.subfolder.conf.sample           |  5 +----
 beets.subfolder.conf.sample            |  2 --
 bitwarden.subdomain.conf.sample        | 27 ++++++++++++++++++++++----
 bookstack.subdomain.conf.sample        |  2 +-
 calibre-web.subfolder.conf.sample      |  1 +
 calibre.subdomain.conf.sample          |  2 --
 calibre.subfolder.conf.sample          |  1 +
 code-server.subdomain.conf.sample      |  2 --
 collabora.subdomain.conf.sample        |  4 ----
 deluge.subfolder.conf.sample           |  1 +
 documentserver.subdomain.conf.sample   |  3 ---
 dozzle.subfolder.conf.sample           |  1 +
 duplicati.subfolder.conf.sample        |  1 +
 emby.subdomain.conf.sample             |  5 +----
 emby.subfolder.conf.sample             |  3 +--
 flood.subfolder.conf.sample            |  1 +
 glances.subfolder.conf.sample          |  1 +
 gotify.subdomain.conf.sample           |  5 ++---
 grocy.subdomain.conf.sample            |  1 -
 guacamole.subfolder.conf.sample        |  1 +
 homeassistant.subdomain.conf.sample    |  5 -----
 jellyfin.subdomain.conf.sample         |  4 +---
 jellyfin.subfolder.conf.sample         |  3 +--
 jenkins.subfolder.conf.sample          |  1 +
 kanzi.subfolder.conf.sample            |  1 +
 mailu.subfolder.conf.sample            |  6 ++++--
 medusa.subdomain.conf.sample           |  2 --
 medusa.subfolder.conf.sample           |  2 --
 monitorr.subfolder.conf.sample         |  1 +
 mytinytodo.subfolder.conf.sample       |  1 +
 netboot.subdomain.conf.sample          |  1 +
 netdata.subfolder.conf.sample          |  1 +
 nextcloud.subfolder.conf.sample        |  3 +--
 nzbhydra.subdomain.conf.sample         |  1 -
 ombi.subdomain.conf.sample             |  1 +
 ombi.subfolder.conf.sample             |  2 ++
 phpmyadmin.subfolder.conf.sample       |  1 +
 pihole.subfolder.conf.sample           |  2 ++
 plex.subdomain.conf.sample             |  3 ---
 plex.subfolder.conf.sample             |  2 ++
 plexwebtools.subfolder.conf.sample     |  1 +
 portainer.subdomain.conf.sample        |  7 ++-----
 portainer.subfolder.conf.sample        |  5 ++---
 pydio-cells.subdomain.conf.sample      |  8 +++-----
 qbittorrent.subfolder.conf.sample      |  1 +
 radarr.subdomain.conf.sample           |  4 ----
 radarr.subfolder.conf.sample           |  4 ----
 rutorrent.subfolder.conf.sample        |  1 +
 scope.subfolder.conf.sample            |  3 +--
 sickchill.subdomain.conf.sample        |  2 --
 sickchill.subfolder.conf.sample        |  2 --
 synclounge.subdomain.conf.sample       |  8 --------
 synclounge.subfolder.conf.sample       |  9 ++-------
 taisun.subdomain.conf.sample           |  3 ---
 thelounge.subfolder.conf.sample        |  1 +
 unifi-controller.subdomain.conf.sample | 27 ++------------------------
 youtube-dl.subfolder.conf.sample       |  7 +++----
 60 files changed, 79 insertions(+), 133 deletions(-)

diff --git a/adguard.subdomain.conf.sample b/adguard.subdomain.conf.sample
index 0f2d7df..2acf72d 100644
--- a/adguard.subdomain.conf.sample
+++ b/adguard.subdomain.conf.sample
@@ -44,6 +44,6 @@ server {
         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
index 3f2bbde..5f59408 100644
--- a/adminer.subfolder.conf.sample
+++ b/adminer.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /adminer {
     return 301 $scheme://$host/adminer/;
 }
+
 location ^~ /adminer/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
diff --git a/bazarr.subdomain.conf.sample b/bazarr.subdomain.conf.sample
index 8a439be..12e9cf7 100644
--- a/bazarr.subdomain.conf.sample
+++ b/bazarr.subdomain.conf.sample
@@ -35,8 +35,6 @@ server {
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "Upgrade";
     }
 
     location ~ (/bazarr)?/api {
@@ -47,7 +45,5 @@ server {
         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/bazarr.subfolder.conf.sample b/bazarr.subfolder.conf.sample
index ce306d2..c583292 100644
--- a/bazarr.subfolder.conf.sample
+++ b/bazarr.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /bazarr {
     return 301 $scheme://$host/bazarr/;
 }
+
 location ^~ /bazarr/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
@@ -22,8 +23,6 @@ location ^~ /bazarr/ {
     set $upstream_proto http;
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "Upgrade";
 }
 
 location ^~ /bazarr/api {
@@ -34,6 +33,4 @@ location ^~ /bazarr/api {
     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/beets.subfolder.conf.sample b/beets.subfolder.conf.sample
index 6c430fb..56794ca 100644
--- a/beets.subfolder.conf.sample
+++ b/beets.subfolder.conf.sample
@@ -19,8 +19,6 @@ location /beets {
     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;
     proxy_set_header X-Script-Name /beets;
 }
diff --git a/bitwarden.subdomain.conf.sample b/bitwarden.subdomain.conf.sample
index a67092a..55afe86 100644
--- a/bitwarden.subdomain.conf.sample
+++ b/bitwarden.subdomain.conf.sample
@@ -1,5 +1,6 @@
 # make sure that your dns has a cname set for bitwarden and that your bitwarden container is not using a base url
 # make sure your bitwarden container is named "bitwarden"
+# set the environment variable WEBSOCKET_ENABLED=true on your bitwarden container
 
 server {
     listen 443 ssl;
@@ -38,7 +39,18 @@ server {
 
     }
 
-    location /notifications/hub {
+    location /admin {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        # enable the next two lines for ldap auth
+        #auth_request /auth;
+        #error_page 401 =200 /ldaplogin;
+
+        # enable for Authelia
+        #include /config/nginx/authelia-location.conf;
+
         include /config/nginx/proxy.conf;
         resolver 127.0.0.11 valid=30s;
         set $upstream_app bitwarden;
@@ -46,8 +58,16 @@ server {
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "Upgrade";
+    }
+
+    location /notifications/hub {
+        include /config/nginx/proxy.conf;
+        resolver 127.0.0.11 valid=30s;
+        set $upstream_app bitwarden;
+        set $upstream_port 3012;
+        set $upstream_proto http;
+        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location /notifications/hub/negotiate {
@@ -59,5 +79,4 @@ server {
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
     }
-
 }
diff --git a/bookstack.subdomain.conf.sample b/bookstack.subdomain.conf.sample
index b63186a..4b11b7e 100644
--- a/bookstack.subdomain.conf.sample
+++ b/bookstack.subdomain.conf.sample
@@ -37,5 +37,5 @@ server {
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-    }   
+    }
 }
diff --git a/calibre-web.subfolder.conf.sample b/calibre-web.subfolder.conf.sample
index b31f2b8..15f54f2 100644
--- a/calibre-web.subfolder.conf.sample
+++ b/calibre-web.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /calibre-web {
     return 301 $scheme://$host/calibre-web/;
 }
+
 location ^~ /calibre-web/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
diff --git a/calibre.subdomain.conf.sample b/calibre.subdomain.conf.sample
index 368b4d7..d1c5fc7 100644
--- a/calibre.subdomain.conf.sample
+++ b/calibre.subdomain.conf.sample
@@ -35,7 +35,5 @@ server {
         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
index 2338ae2..cf4f7ae 100644
--- a/calibre.subfolder.conf.sample
+++ b/calibre.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /calibre {
     return 301 $scheme://$host/calibre/;
 }
+
 location ^~ /calibre/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
diff --git a/code-server.subdomain.conf.sample b/code-server.subdomain.conf.sample
index 412df4c..91c308d 100644
--- a/code-server.subdomain.conf.sample
+++ b/code-server.subdomain.conf.sample
@@ -35,7 +35,5 @@ server {
         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/collabora.subdomain.conf.sample b/collabora.subdomain.conf.sample
index caebc04..4282b31 100644
--- a/collabora.subdomain.conf.sample
+++ b/collabora.subdomain.conf.sample
@@ -49,8 +49,6 @@ server {
         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;
         proxy_read_timeout 36000s;
     }
@@ -74,8 +72,6 @@ server {
         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;
         proxy_read_timeout 36000s;
     }
diff --git a/deluge.subfolder.conf.sample b/deluge.subfolder.conf.sample
index 80eee35..0b5a4e7 100644
--- a/deluge.subfolder.conf.sample
+++ b/deluge.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /deluge {
     return 301 $scheme://$host/deluge/;
 }
+
 location ^~ /deluge/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
diff --git a/documentserver.subdomain.conf.sample b/documentserver.subdomain.conf.sample
index 1624040..7f66954 100644
--- a/documentserver.subdomain.conf.sample
+++ b/documentserver.subdomain.conf.sample
@@ -35,9 +35,6 @@ server {
         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;
 
     }
 }
diff --git a/dozzle.subfolder.conf.sample b/dozzle.subfolder.conf.sample
index 919eaaa..8112e1e 100644
--- a/dozzle.subfolder.conf.sample
+++ b/dozzle.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /dozzle {
     return 301 $scheme://$host/dozzle/;
 }
+
 location ^~ /dozzle/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
diff --git a/duplicati.subfolder.conf.sample b/duplicati.subfolder.conf.sample
index 0f6dae1..acc40ca 100644
--- a/duplicati.subfolder.conf.sample
+++ b/duplicati.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /duplicati {
     return 301 $scheme://$host/duplicati/;
 }
+
 location ^~ /duplicati/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
diff --git a/emby.subdomain.conf.sample b/emby.subdomain.conf.sample
index b32543c..a11bb4a 100644
--- a/emby.subdomain.conf.sample
+++ b/emby.subdomain.conf.sample
@@ -25,8 +25,5 @@ server {
 
         proxy_set_header Range $http_range;
         proxy_set_header If-Range $http_if_range;
-
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $http_connection;
-   }
+    }
 }
diff --git a/emby.subfolder.conf.sample b/emby.subfolder.conf.sample
index f114167..f30a86b 100644
--- a/emby.subfolder.conf.sample
+++ b/emby.subfolder.conf.sample
@@ -8,6 +8,7 @@
 location /emby {
     return 301 $scheme://$host/emby/;
 }
+
 location ^~ /emby/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
@@ -28,6 +29,4 @@ location ^~ /embywebsocket {
     set $upstream_proto http;
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection $http_connection;
 }
diff --git a/flood.subfolder.conf.sample b/flood.subfolder.conf.sample
index 50170ca..e9e7946 100644
--- a/flood.subfolder.conf.sample
+++ b/flood.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /flood {
     return 301 $scheme://$host/flood/;
 }
+
 location ^~ /flood/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
diff --git a/glances.subfolder.conf.sample b/glances.subfolder.conf.sample
index 676656e..860a1e9 100644
--- a/glances.subfolder.conf.sample
+++ b/glances.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /glances {
     return 301 $scheme://$host/glances/;
 }
+
 location ^~ /glances/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
diff --git a/gotify.subdomain.conf.sample b/gotify.subdomain.conf.sample
index ddfb5c2..1dcefc7 100644
--- a/gotify.subdomain.conf.sample
+++ b/gotify.subdomain.conf.sample
@@ -34,7 +34,6 @@ server {
         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";
+
     }
-}
\ No newline at end of file
+}
diff --git a/grocy.subdomain.conf.sample b/grocy.subdomain.conf.sample
index 7aa965b..409eb8c 100644
--- a/grocy.subdomain.conf.sample
+++ b/grocy.subdomain.conf.sample
@@ -36,5 +36,4 @@ server {
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
     }
-
 }
diff --git a/guacamole.subfolder.conf.sample b/guacamole.subfolder.conf.sample
index ceb34ff..30a07ee 100644
--- a/guacamole.subfolder.conf.sample
+++ b/guacamole.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /guacamole {
     return 301 $scheme://$host/guacamole/;
 }
+
 location ^~ /guacamole/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
diff --git a/homeassistant.subdomain.conf.sample b/homeassistant.subdomain.conf.sample
index 1913e44..3a60af2 100644
--- a/homeassistant.subdomain.conf.sample
+++ b/homeassistant.subdomain.conf.sample
@@ -44,10 +44,5 @@ server {
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-        proxy_set_header Host $host;
-
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
     }
 }
diff --git a/jellyfin.subdomain.conf.sample b/jellyfin.subdomain.conf.sample
index 88c25e1..afef92a 100644
--- a/jellyfin.subdomain.conf.sample
+++ b/jellyfin.subdomain.conf.sample
@@ -35,7 +35,5 @@ server {
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $http_connection;
-   }
+    }
 }
diff --git a/jellyfin.subfolder.conf.sample b/jellyfin.subfolder.conf.sample
index abebb57..eb4f2dd 100644
--- a/jellyfin.subfolder.conf.sample
+++ b/jellyfin.subfolder.conf.sample
@@ -8,6 +8,7 @@
 location /jellyfin {
     return 301 $scheme://$host/jellyfin/;
 }
+
 location ^~ /jellyfin/ {
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
@@ -18,6 +19,4 @@ location ^~ /jellyfin/ {
 
     proxy_set_header Range $http_range;
     proxy_set_header If-Range $http_if_range;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection $http_connection;
 }
diff --git a/jenkins.subfolder.conf.sample b/jenkins.subfolder.conf.sample
index 8b3f8c3..6607db5 100644
--- a/jenkins.subfolder.conf.sample
+++ b/jenkins.subfolder.conf.sample
@@ -4,6 +4,7 @@
 location /jenkins {
     return 301 $scheme://$host/jenkins/;
 }
+
 location ^~ /jenkins/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
diff --git a/kanzi.subfolder.conf.sample b/kanzi.subfolder.conf.sample
index 680db1f..3861f18 100644
--- a/kanzi.subfolder.conf.sample
+++ b/kanzi.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /kanzi {
     return 301 $scheme://$host/kanzi/;
 }
+
 location ^~ /kanzi/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
diff --git a/mailu.subfolder.conf.sample b/mailu.subfolder.conf.sample
index 2c84712..4562d40 100644
--- a/mailu.subfolder.conf.sample
+++ b/mailu.subfolder.conf.sample
@@ -6,6 +6,7 @@
 location /admin{
     return 301 $scheme://$host/admin/;
 }
+
 location ^~ /admin/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
@@ -17,7 +18,7 @@ location ^~ /admin/ {
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
-    
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app front;
@@ -30,6 +31,7 @@ location ^~ /admin/ {
 location /webmail{
     return 301 $scheme://$host/webmail/;
 }
+
 location ^~ /webmail/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
@@ -41,7 +43,7 @@ location ^~ /webmail/ {
 
     # enable for Authelia, also enable authelia-server.conf in the default site config
     #include /config/nginx/authelia-location.conf;
-    
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app front;
diff --git a/medusa.subdomain.conf.sample b/medusa.subdomain.conf.sample
index 32d4a93..6a57d4a 100644
--- a/medusa.subdomain.conf.sample
+++ b/medusa.subdomain.conf.sample
@@ -29,8 +29,6 @@ server {
         #include /config/nginx/authelia-location.conf;
 
         include /config/nginx/proxy.conf;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
         resolver 127.0.0.11 valid=30s;
         set $upstream_app medusa;
         set $upstream_port 8081;
diff --git a/medusa.subfolder.conf.sample b/medusa.subfolder.conf.sample
index 049f857..8cca3b8 100644
--- a/medusa.subfolder.conf.sample
+++ b/medusa.subfolder.conf.sample
@@ -13,8 +13,6 @@ location ^~ /medusa {
     #include /config/nginx/authelia-location.conf;
 
     include /config/nginx/proxy.conf;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
     resolver 127.0.0.11 valid=30s;
     set $upstream_app medusa;
     set $upstream_port 8081;
diff --git a/monitorr.subfolder.conf.sample b/monitorr.subfolder.conf.sample
index d291e32..a76442a 100644
--- a/monitorr.subfolder.conf.sample
+++ b/monitorr.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /monitorr {
     return 301 $scheme://$host/monitorr/;
 }
+
 location ^~ /monitorr/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
diff --git a/mytinytodo.subfolder.conf.sample b/mytinytodo.subfolder.conf.sample
index fbfbb8b..f62d13e 100644
--- a/mytinytodo.subfolder.conf.sample
+++ b/mytinytodo.subfolder.conf.sample
@@ -4,6 +4,7 @@
 location /todo {
     return 301 $scheme://$host/todo/;
 }
+
 location ^~ /todo/ {
 
     # enable the next two lines for http auth
diff --git a/netboot.subdomain.conf.sample b/netboot.subdomain.conf.sample
index 2b086c0..d9027f3 100644
--- a/netboot.subdomain.conf.sample
+++ b/netboot.subdomain.conf.sample
@@ -34,5 +34,6 @@ server {
         set $upstream_port 3000;
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 }
diff --git a/netdata.subfolder.conf.sample b/netdata.subfolder.conf.sample
index 4eeb35c..51f1afa 100644
--- a/netdata.subfolder.conf.sample
+++ b/netdata.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /netdata {
     return 301 $scheme://$host/netdata/;
 }
+
 location ^~ /netdata/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
diff --git a/nextcloud.subfolder.conf.sample b/nextcloud.subfolder.conf.sample
index 2ee4393..cf92430 100644
--- a/nextcloud.subfolder.conf.sample
+++ b/nextcloud.subfolder.conf.sample
@@ -36,7 +36,6 @@ location ^~ /nextcloud/ {
 
     proxy_set_header Range $http_range;
     proxy_set_header If-Range $http_if_range;
-    proxy_set_header Connection $http_connection;
-    proxy_redirect off;
+        proxy_redirect off;
     proxy_ssl_session_reuse off;
 }
diff --git a/nzbhydra.subdomain.conf.sample b/nzbhydra.subdomain.conf.sample
index 3b54538..b6deb30 100644
--- a/nzbhydra.subdomain.conf.sample
+++ b/nzbhydra.subdomain.conf.sample
@@ -86,5 +86,4 @@ server {
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
     }
-
 }
diff --git a/ombi.subdomain.conf.sample b/ombi.subdomain.conf.sample
index 3939d61..71ea34c 100644
--- a/ombi.subdomain.conf.sample
+++ b/ombi.subdomain.conf.sample
@@ -58,6 +58,7 @@ server {
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
    }
+
    if ($http_referer ~* /ombi) {
        rewrite ^/swagger/(.*) /ombi/swagger/$1? redirect;
    }
diff --git a/ombi.subfolder.conf.sample b/ombi.subfolder.conf.sample
index a433387..86a73e9 100644
--- a/ombi.subfolder.conf.sample
+++ b/ombi.subfolder.conf.sample
@@ -35,6 +35,7 @@ location ^~ /ombi/api {
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
 }
+
 if ($http_referer ~* /ombi) {
     rewrite ^/api/(.*) /ombi/api/$1? redirect;
 }
@@ -49,6 +50,7 @@ location ^~ /ombi/swagger {
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
 }
+
 if ($http_referer ~* /ombi) {
     rewrite ^/swagger/(.*) /ombi/swagger/$1? redirect;
 }
diff --git a/phpmyadmin.subfolder.conf.sample b/phpmyadmin.subfolder.conf.sample
index 233eae3..03bf518 100644
--- a/phpmyadmin.subfolder.conf.sample
+++ b/phpmyadmin.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /phpmyadmin {
     return 301 $scheme://$host/phpmyadmin/;
 }
+
 location ^~ /phpmyadmin/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
diff --git a/pihole.subfolder.conf.sample b/pihole.subfolder.conf.sample
index 45d6b1d..ddcf4e4 100644
--- a/pihole.subfolder.conf.sample
+++ b/pihole.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /pihole {
     return 301 $scheme://$host/pihole/;
 }
+
 location ^~ /pihole/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
@@ -29,6 +30,7 @@ location ^~ /pihole/ {
 location /pihole/admin {
     return 301 $scheme://$host/pihole/admin/;
 }
+
 location ^~ /pihole/admin/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
diff --git a/plex.subdomain.conf.sample b/plex.subdomain.conf.sample
index 7fe06bc..5e63878 100644
--- a/plex.subdomain.conf.sample
+++ b/plex.subdomain.conf.sample
@@ -40,9 +40,6 @@ server {
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-
         proxy_set_header X-Plex-Client-Identifier $http_x_plex_client_identifier;
         proxy_set_header X-Plex-Device $http_x_plex_device;
         proxy_set_header X-Plex-Device-Name $http_x_plex_device_name;
diff --git a/plex.subfolder.conf.sample b/plex.subfolder.conf.sample
index 22d37a9..e3ac953 100644
--- a/plex.subfolder.conf.sample
+++ b/plex.subfolder.conf.sample
@@ -9,6 +9,7 @@
 location /plex {
     return 301 $scheme://$host/plex/;
 }
+
 location ^~ /plex/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
@@ -43,6 +44,7 @@ location ^~ /plex/ {
     proxy_set_header X-Plex-Device-Vendor $http_x_plex_device_vendor;
     proxy_set_header X-Plex-Model $http_x_plex_model;
 }
+
 if ($http_referer ~* /plex) {
     rewrite ^/web/(.*) /plex/web/$1? redirect;
 }
diff --git a/plexwebtools.subfolder.conf.sample b/plexwebtools.subfolder.conf.sample
index cb9974d..fc2c9c6 100644
--- a/plexwebtools.subfolder.conf.sample
+++ b/plexwebtools.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /plexwebtools {
     return 301 $scheme://$host/plexwebtools/;
 }
+
 location ^~ /plexwebtools/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
diff --git a/portainer.subdomain.conf.sample b/portainer.subdomain.conf.sample
index 676d004..614eaf9 100644
--- a/portainer.subdomain.conf.sample
+++ b/portainer.subdomain.conf.sample
@@ -35,8 +35,7 @@ server {
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-        proxy_set_header Connection "";
-        proxy_hide_header X-Frame-Options; # Possibly nott needed after Portainer 1.20.0
+        proxy_hide_header X-Frame-Options; # Possibly not needed after Portainer 1.20.0
     }
 
     location /api/websocket/ {
@@ -58,8 +57,6 @@ server {
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_hide_header X-Frame-Options; # Possibly nott needed after Portainer 1.20.0
+        proxy_hide_header X-Frame-Options; # Possibly not needed after Portainer 1.20.0
     }
 }
diff --git a/portainer.subfolder.conf.sample b/portainer.subfolder.conf.sample
index fdc762c..fafed86 100644
--- a/portainer.subfolder.conf.sample
+++ b/portainer.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /portainer {
     return 301 $scheme://$host/portainer/;
 }
+
 location ^~ /portainer/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
@@ -35,7 +36,5 @@ location ^~ /portainer/api/websocket/ {
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
     rewrite /portainer(.*) $1 break;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-    proxy_hide_header X-Frame-Options; # Possibly nott needed after Portainer 1.20.0
+    proxy_hide_header X-Frame-Options; # Possibly not needed after Portainer 1.20.0
 }
diff --git a/pydio-cells.subdomain.conf.sample b/pydio-cells.subdomain.conf.sample
index 923f28a..f96d048 100644
--- a/pydio-cells.subdomain.conf.sample
+++ b/pydio-cells.subdomain.conf.sample
@@ -34,6 +34,7 @@ server {
         set $upstream_port 8080;
         set $upstream_proto https;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     }
 
     location /ws {
@@ -54,10 +55,7 @@ server {
         set $upstream_port 8080;
         set $upstream_proto https;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
-        
-        proxy_buffering off;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-    }
 
+        proxy_buffering off;
+    }
 }
diff --git a/qbittorrent.subfolder.conf.sample b/qbittorrent.subfolder.conf.sample
index f0886fd..647145c 100644
--- a/qbittorrent.subfolder.conf.sample
+++ b/qbittorrent.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /qbittorrent {
     return 301 $scheme://$host/qbittorrent/;
 }
+
 location ^~ /qbittorrent/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
diff --git a/radarr.subdomain.conf.sample b/radarr.subdomain.conf.sample
index 98ca06f..62b0de6 100644
--- a/radarr.subdomain.conf.sample
+++ b/radarr.subdomain.conf.sample
@@ -35,8 +35,6 @@ server {
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $http_connection;
     }
 
     location ~ (/radarr)?/api {
@@ -47,7 +45,5 @@ server {
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection $http_connection;
     }
 }
diff --git a/radarr.subfolder.conf.sample b/radarr.subfolder.conf.sample
index 1de4c03..f826e31 100644
--- a/radarr.subfolder.conf.sample
+++ b/radarr.subfolder.conf.sample
@@ -19,8 +19,6 @@ location ^~ /radarr {
     set $upstream_proto http;
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection $http_connection;
 }
 
 location ^~ /radarr/api {
@@ -31,6 +29,4 @@ location ^~ /radarr/api {
     set $upstream_proto http;
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection $http_connection;
 }
diff --git a/rutorrent.subfolder.conf.sample b/rutorrent.subfolder.conf.sample
index 0ec949d..98a7931 100644
--- a/rutorrent.subfolder.conf.sample
+++ b/rutorrent.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /rutorrent {
     return 301 $scheme://$host/rutorrent/;
 }
+
 location ^~ /rutorrent/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
diff --git a/scope.subfolder.conf.sample b/scope.subfolder.conf.sample
index 7bc6b9f..2c1ace8 100644
--- a/scope.subfolder.conf.sample
+++ b/scope.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /scope {
     return 301 $scheme://$host/scope/;
 }
+
 location ^~ /scope/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
@@ -23,6 +24,4 @@ location ^~ /scope/ {
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
     rewrite /scope(.*) $1 break;
-    proxy_set_header Upgrade $http_upgrade;
-	proxy_set_header Connection "upgrade";
 }
diff --git a/sickchill.subdomain.conf.sample b/sickchill.subdomain.conf.sample
index 67802c8..f282673 100644
--- a/sickchill.subdomain.conf.sample
+++ b/sickchill.subdomain.conf.sample
@@ -36,8 +36,6 @@ server {
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
         proxy_set_header Host $http_host;
-        proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header X-Forwarded-Proto $scheme;
     }
 }
diff --git a/sickchill.subfolder.conf.sample b/sickchill.subfolder.conf.sample
index 44e9c9d..6b96055 100644
--- a/sickchill.subfolder.conf.sample
+++ b/sickchill.subfolder.conf.sample
@@ -20,8 +20,6 @@ location ^~ /sickchill {
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
     proxy_set_header Host $http_host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
     proxy_set_header X-Forwarded-Proto $scheme;
 
 }
diff --git a/synclounge.subdomain.conf.sample b/synclounge.subdomain.conf.sample
index 1ef22a6..29b9f1c 100644
--- a/synclounge.subdomain.conf.sample
+++ b/synclounge.subdomain.conf.sample
@@ -40,8 +40,6 @@ server {
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
     }
 
     ###
@@ -57,9 +55,6 @@ server {
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-
     }
 
     # Due to a bug in SyncLounge, some websockets calls don't respect the base url (server root) setting
@@ -71,8 +66,5 @@ server {
         set $upstream_proto http;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port/slserver/socket.io/;
 
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-
     }
 }
diff --git a/synclounge.subfolder.conf.sample b/synclounge.subfolder.conf.sample
index 095f00e..7621591 100644
--- a/synclounge.subfolder.conf.sample
+++ b/synclounge.subfolder.conf.sample
@@ -15,7 +15,6 @@
 #        }
 #}
 
-
 # Uncomment to force SyncLounge to always load over http. Only use this if you've allowed http per the above instructions.
 #if ($scheme = https) {
 #    return 301 http://$host$request_uri;
@@ -54,10 +53,8 @@ location /slweb {
 
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-
 }
+
 if ($http_referer ~* /slweb) {
     # Some requests like /config don't respect the base url (web root) setting
     rewrite ^/config /slweb/config redirect;
@@ -79,10 +76,8 @@ location /slserver {
 
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-
 }
+
 if ($http_referer ~* /slserver) {
     # Some requests like socket.io don't respect the base url (server root) setting
     rewrite ^/socket.io/(.*) /slserver/socket.io/$1? redirect;
diff --git a/taisun.subdomain.conf.sample b/taisun.subdomain.conf.sample
index 5eb7dc4..88ce5d0 100644
--- a/taisun.subdomain.conf.sample
+++ b/taisun.subdomain.conf.sample
@@ -36,8 +36,5 @@ server {
         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/thelounge.subfolder.conf.sample b/thelounge.subfolder.conf.sample
index 6520630..1078aa0 100644
--- a/thelounge.subfolder.conf.sample
+++ b/thelounge.subfolder.conf.sample
@@ -3,6 +3,7 @@
 location /thelounge {
     return 301 $scheme://$host/thelounge/;
 }
+
 location ^~ /thelounge/ {
     # enable the next two lines for http auth
     #auth_basic "Restricted";
diff --git a/unifi-controller.subdomain.conf.sample b/unifi-controller.subdomain.conf.sample
index 5993fd7..e015a58 100644
--- a/unifi-controller.subdomain.conf.sample
+++ b/unifi-controller.subdomain.conf.sample
@@ -1,4 +1,6 @@
 # make sure that your dns has a cname set for unifi and that your unifi-controller container is not using a base url
+# NOTE: If you use the proxy_cookie_path setting in proxy.conf you need to remove HTTPOnly;
+# ex: proxy_cookie_path / "/; Secure";
 
 server {
     listen 443 ssl;
@@ -35,31 +37,6 @@ server {
         set $upstream_proto https;
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
-    }
-
-    location /wss {
-        # enable the next two lines for http auth
-        #auth_basic "Restricted";
-        #auth_basic_user_file /config/nginx/.htpasswd;
-
-        # enable the next two lines for ldap auth
-        #auth_request /auth;
-        #error_page 401 =200 /ldaplogin;
-
-        # enable for Authelia
-        #include /config/nginx/authelia-location.conf;
-
-        include /config/nginx/proxy.conf;
-        resolver 127.0.0.11 valid=30s;
-        set $upstream_app unifi-controller;
-        set $upstream_port 8443;
-        set $upstream_proto https;
-        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
-
         proxy_buffering off;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "Upgrade";
-        proxy_ssl_verify off;
     }
-
 }
diff --git a/youtube-dl.subfolder.conf.sample b/youtube-dl.subfolder.conf.sample
index 184496a..304b2f6 100644
--- a/youtube-dl.subfolder.conf.sample
+++ b/youtube-dl.subfolder.conf.sample
@@ -12,17 +12,16 @@ location ^~ /youtube-dl/ {
     # enable the next two lines for ldap auth, also customize and enable ldap.conf in the default conf
     #auth_request /auth;
     #error_page 401 =200 /login;
-	
+
     include /config/nginx/proxy.conf;
     resolver 127.0.0.11 valid=30s;
     set $upstream_app  youtube-dl-server;
     set $upstream_port 8080;
     set $upstream_proto http;
     proxy_pass $upstream_proto://$upstream_app:$upstream_port;
+
     proxy_redirect  off;
-	
-    rewrite /youtube-dl(.*) $1 break;
-	
     proxy_set_header Referer '';
     proxy_set_header Host $upstream_app:8080;
+    rewrite /youtube-dl(.*) $1 break;
 }

From ef8065e06d8611825b84411a64b2f79d594e7acb Mon Sep 17 00:00:00 2001
From: Eric Nemchik <eric@nemchik.com>
Date: Tue, 1 Sep 2020 14:13:25 -0500
Subject: [PATCH 126/126] Adjust homeassistant for websocket Resolves
 https://github.com/linuxserver/reverse-proxy-confs/pull/191

---
 homeassistant.subdomain.conf.sample | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/homeassistant.subdomain.conf.sample b/homeassistant.subdomain.conf.sample
index 3a60af2..addab49 100644
--- a/homeassistant.subdomain.conf.sample
+++ b/homeassistant.subdomain.conf.sample
@@ -36,13 +36,4 @@ server {
         proxy_pass $upstream_proto://$upstream_app:$upstream_port;
 
     }
-
-    location /api/websocket {
-        resolver 127.0.0.11 valid=30s;
-        set $upstream_app homeassistant;
-        set $upstream_port 8123;
-        set $upstream_proto http;
-        proxy_pass $upstream_proto://$upstream_app:$upstream_port;
-
-    }
 }