merge upstream

ZoeyVid · May 23, 2024 · 618df85 · 618df85
1 parent bd4a8f1
commit 618df85
Show file tree

Hide file tree

Showing 20 changed files with 28 additions and 764 deletions.
diff --git a/backend/templates/_location.conf b/backend/templates/_location.conf
@@ -1,17 +1,17 @@
-  location {{ path }} {
-    set $forward_path  "{{ forward_path }}";
+location {{ path }} {
+  {{ advanced_config }}
 
-    {% if allow_websocket_upgrade == 1 or allow_websocket_upgrade == true %}
-    proxy_set_header Upgrade    $http_upgrade;
-    proxy_set_header Connection $connection_upgrade;
-    {% endif %}
-
-    include conf.d/include/proxy-location.conf;
-    proxy_set_header X-Forwarded-Host $host{{ path }};
-    if ($forward_path = "") {
-        rewrite ^{{ path }}(/.*)$ $1 break;
-    }
-    proxy_pass {{ forward_scheme }}://{{ forward_host }}:{{ forward_port }}{{ forward_path }};
+  set $forward_path  "{{ forward_path }}";
+
+  {% if allow_websocket_upgrade == 1 or allow_websocket_upgrade == true %}
+  proxy_set_header Upgrade    $http_upgrade;
+  proxy_set_header Connection $connection_upgrade;
+  {% endif %}
 
-    {{ advanced_config }}
+  include conf.d/include/proxy-location.conf;
+  proxy_set_header X-Forwarded-Host $host{{ path }};
+  if ($forward_path = "") {
+      rewrite ^{{ path }}(/.*)$ $1 break;
   }
+  proxy_pass {{ forward_scheme }}://{{ forward_host }}:{{ forward_port }}{{ forward_path }};
+}
diff --git a/backend/templates/dead_host.conf b/backend/templates/dead_host.conf
@@ -8,9 +8,11 @@ server {
 {% include "_forced_tls.conf" %}
 {% include "_brotli.conf" %}
 
+include conf.d/include/acme-challenge.conf;
+include conf.d/include/block-exploits.conf;
+
 {{ advanced_config }}
-  include conf.d/include/acme-challenge.conf;
-  include conf.d/include/block-exploits.conf;
+
 {% if use_default_location == 1 or use_default_location == true %}
   location / {
     include conf.d/include/acme-challenge.conf;

diff --git a/backend/templates/proxy_host.conf b/backend/templates/proxy_host.conf
@@ -33,6 +33,9 @@ server {
 
 {{ advanced_config }}
 
+# custom locations
+{{ locations }}
+
 {% if use_default_location == 1 or use_default_location == true %}
   location / {
     include conf.d/include/acme-challenge.conf;
@@ -44,14 +47,9 @@ server {
 
     # Proxy!
     include conf.d/include/proxy.conf;
-
-    # custom locations
-    {{ locations }}
   }
 {% endif %}
 
-{{ locations }}
-
   # Custom
   include /data/nginx/custom/server_proxy.conf;
 }

diff --git a/backend/templates/redirection_host.conf b/backend/templates/redirection_host.conf
@@ -8,9 +8,11 @@ server {
 {% include "_forced_tls.conf" %}
 {% include "_brotli.conf" %}
 
+include conf.d/include/acme-challenge.conf;
+include conf.d/include/block-exploits.conf;
+
 {{ advanced_config }}
-  include conf.d/include/acme-challenge.conf;
-  include conf.d/include/block-exploits.conf;
+
 {% if use_default_location == 1 or use_default_location == true %}
   location / {
     include conf.d/include/acme-challenge.conf;

diff --git a/backend/templates/stream.conf b/backend/templates/stream.conf
@@ -3,6 +3,7 @@
 # ------------------------------------------------------------
 
 {% if enabled == 1 or enabled == true %}
+
 {% if tcp_forwarding == 1 or tcp_forwarding == true -%}
 server {
   listen {{ incoming_port }};
@@ -15,6 +16,7 @@ server {
   include /data/nginx/custom/server_stream_tcp.conf;
 }
 {% endif %}
+
 {% if udp_forwarding == 1 or udp_forwarding == true %}
 server {
   listen {{ incoming_port }} udp;
@@ -26,4 +28,5 @@ server {
   include /data/nginx/custom/server_stream_udp.conf;
 }
 {% endif %}
+
 {% endif %}
diff --git a/docker/dev/dnsrouter-config.json b/docker/dev/dnsrouter-config.json
diff --git a/docker/dev/letsencrypt.ini b/docker/dev/letsencrypt.ini
diff --git a/docker/dev/pdns-db.sql b/docker/dev/pdns-db.sql