make auth_request also use an upstream block

Author: Zoey2936

backend/templates/proxy_host.conf

@@ -7,6 +7,51 @@
 {% if enabled %}
   {{ upstreams }}
 
+  {% assign auth_request_anubis_upstream_host = env.AUTH_REQUEST_ANUBIS_UPSTREAM | replace: "https://", "" | replace: "http://", "" | split: "/" | first %}
+  {% if env.AUTH_REQUEST_ANUBIS_UPSTREAM contains "https://" %}{% assign auth_request_anubis_upstream_scheme = "https://" %}{% else %}{% assign auth_request_anubis_upstream_scheme = "http://" %}{% endif %}
+  {% if npmplus_auth_request == "anubis" or create_anubis_locations %}
+    upstream auth_request_anubis_{{ id }} {
+      zone auth_request_anubis_{{ id }} 64k;
+      server {{ auth_request_anubis_upstream_host }} resolve;
+    }
+  {% endif %}
+
+  {% assign auth_request_tinyauth_upstream_host = env.AUTH_REQUEST_TINYAUTH_UPSTREAM | replace: "https://", "" | replace: "http://", "" | split: "/" | first %}
+  {% if env.AUTH_REQUEST_TINYAUTH_UPSTREAM contains "https://" %}{% assign auth_request_tinyauth_upstream_scheme = "https://" %}{% else %}{% assign auth_request_tinyauth_upstream_scheme = "http://" %}{% endif %}
+  {% if npmplus_auth_request == "tinyauth" or create_tinyauth_locations %}
+    upstream auth_request_tinyauth_{{ id }} {
+      zone auth_request_tinyauth_{{ id }} 64k;
+      server {{ auth_request_tinyauth_upstream_host }} resolve;
+    }
+  {% endif %}
+
+  {% assign auth_request_oauth2proxy_upstream_host = env.AUTH_REQUEST_OAUTH2PROXY_UPSTREAM | replace: "https://", "" | replace: "http://", "" | split: "/" | first %}
+  {% if env.AUTH_REQUEST_OAUTH2PROXY_UPSTREAM contains "https://" %}{% assign auth_request_oauth2proxy_upstream_scheme = "https://" %}{% else %}{% assign auth_request_oauth2proxy_upstream_scheme = "http://" %}{% endif %}
+  {% if npmplus_auth_request == "oauth2proxy" or create_oauth2proxy_locations %}
+    upstream auth_request_oauth2proxy_{{ id }} {
+      zone auth_request_oauth2proxy_{{ id }} 64k;
+      server {{ auth_request_oauth2proxy_upstream_host }} resolve;
+    }
+  {% endif %}
+
+  {% assign auth_request_authelia_upstream_host = env.AUTH_REQUEST_AUTHELIA_UPSTREAM | replace: "https://", "" | replace: "http://", "" | split: "/" | first %}
+  {% if env.AUTH_REQUEST_AUTHELIA_UPSTREAM contains "https://" %}{% assign auth_request_authelia_upstream_scheme = "https://" %}{% else %}{% assign auth_request_authelia_upstream_scheme = "http://" %}{% endif %}
+  {% if npmplus_auth_request == "authelia" or create_authelia_locations %}
+    upstream auth_request_authelia_{{ id }} {
+      zone auth_request_authelia_{{ id }} 64k;
+      server {{ auth_request_authelia_upstream_host }} resolve;
+    }
+  {% endif %}
+
+  {% assign auth_request_authentik_upstream_host = env.AUTH_REQUEST_AUTHENTIK_UPSTREAM | replace: "https://", "" | replace: "http://", "" | split: "/" | first %}
+  {% if env.AUTH_REQUEST_AUTHENTIK_UPSTREAM contains "https://" %}{% assign auth_request_authentik_upstream_scheme = "https://" %}{% else %}{% assign auth_request_authentik_upstream_scheme = "http://" %}{% endif %}
+  {% if npmplus_auth_request == "authentik" or npmplus_auth_request == "authentik-send-basic-auth" or create_authentik_locations %}
+    upstream auth_request_authentik_{{ id }} {
+      zone auth_request_authentik_{{ id }} 64k;
+      server {{ auth_request_authentik_upstream_host }} resolve;
+    }
+  {% endif %}
+
   server {
     {% include "_common.conf" %}
 
@@ -172,10 +217,9 @@
       location /.within.website {
         proxy_ssl_name $proxy_host;
         proxy_set_header Host $proxy_host;
-        set $anubis_upstream {{ env.AUTH_REQUEST_ANUBIS_UPSTREAM }};
         include proxy-headers.conf;
         proxy_set_header Accept-Encoding "";
-        proxy_pass $anubis_upstream$request_uri;
+        proxy_pass {{ auth_request_anubis_upstream_scheme }}auth_request_anubis_{{ id }}$request_uri;
         proxy_method GET;
         proxy_pass_request_body off;
         proxy_set_header Content-Length "";
@@ -193,7 +237,7 @@
         proxy_set_header Host $proxy_host;
         include proxy-headers.conf;
         proxy_set_header Accept-Encoding "";
-        proxy_pass {{ env.AUTH_REQUEST_TINYAUTH_UPSTREAM }}/api/auth/nginx;
+        proxy_pass {{ auth_request_tinyauth_upstream_scheme }}auth_request_tinyauth_{{ id }}/api/auth/nginx;
         internal;
         proxy_method GET;
         proxy_pass_request_body off;
@@ -212,15 +256,15 @@
         proxy_set_header Host $proxy_host;
         include proxy-headers.conf;
         proxy_set_header Accept-Encoding "";
-        proxy_pass {{ env.AUTH_REQUEST_OAUTH2PROXY_UPSTREAM }}$request_uri;
+        proxy_pass {{ auth_request_oauth2proxy_upstream_scheme }}auth_request_oauth2proxy_{{ id }}$request_uri;
         proxy_set_header X-Auth-Request-Redirect $request_uri;
       }
       location /oauth2/auth {
         proxy_ssl_name $proxy_host;
         proxy_set_header Host $proxy_host;
         include proxy-headers.conf;
         proxy_set_header Accept-Encoding "";
-        proxy_pass {{ env.AUTH_REQUEST_OAUTH2PROXY_UPSTREAM }}$request_uri;
+        proxy_pass {{ auth_request_oauth2proxy_upstream_scheme }}auth_request_oauth2proxy_{{ id }}$request_uri;
         internal;
         proxy_method GET;
         proxy_pass_request_body off;
@@ -239,7 +283,7 @@
         proxy_set_header Host $proxy_host;
         include proxy-headers.conf;
         proxy_set_header Accept-Encoding "";
-        proxy_pass {{ env.AUTH_REQUEST_AUTHELIA_UPSTREAM }}/api/authz/auth-request;
+        proxy_pass {{ auth_request_authelia_upstream_scheme }}auth_request_authelia_{{ id }}/api/authz/auth-request;
         internal;
         proxy_method GET;
         proxy_pass_request_body off;
@@ -255,7 +299,7 @@
         proxy_set_header Host $proxy_host;
         include proxy-headers.conf;
         proxy_set_header Accept-Encoding "";
-        proxy_pass {{ env.AUTH_REQUEST_AUTHENTIK_UPSTREAM }}/outpost.goauthentik.io;
+        proxy_pass {{ auth_request_authentik_upstream_scheme }}auth_request_authentik_{{ id }}/outpost.goauthentik.io;
         auth_request_set $auth_cookie $upstream_http_set_cookie;
         add_header Set-Cookie $auth_cookie;
         proxy_method GET;