merge upstream

Signed-off-by: Zoey <zoey@z0ey.de>
2025-08-03 07:53:39 +00:00 · 2024-01-11 22:19:19 +01:00
parent 93216d93e4
commit 3d7877a4a0
16 changed files with 7 additions and 1175 deletions
--- a/backend/templates/_hsts_map.conf
+++ b/backend/templates/_hsts_map.conf
@@ -1,3 +0,0 @@
-map $scheme $hsts_header {
-    https   "max-age=63072000;{% if hsts_subdomains == 1 or hsts_subdomains == true -%} includeSubDomains;{% endif %} preload";
-}
--- a/backend/templates/_location.conf
+++ b/backend/templates/_location.conf
@@ -1,5 +1,3 @@
-  {% include "_hsts_map.conf" %}
-
  location {{ path }} {
    set $forward_path  "{{ forward_path }}";
    
--- a/backend/templates/dead_host.conf
+++ b/backend/templates/dead_host.conf
@@ -1,9 +1,6 @@
 {% include "_header_comment.conf" %}

 {% if enabled %}
-
-{% include "_hsts_map.conf" %}
-
 server {
 {% include "_listen.conf" %}
 {% include "_certificates.conf" %}
--- a/backend/templates/proxy_host.conf
+++ b/backend/templates/proxy_host.conf
@@ -1,9 +1,6 @@
 {% include "_header_comment.conf" %}

 {% if enabled %}
-
-{% include "_hsts_map.conf" %}
-
 server {
  set $forward_scheme {{ forward_scheme }};
  set $server         "{{ forward_host }}";
--- a/backend/templates/redirection_host.conf
+++ b/backend/templates/redirection_host.conf
@@ -1,9 +1,6 @@
 {% include "_header_comment.conf" %}

 {% if enabled %}
-
-{% include "_hsts_map.conf" %}
-
 server {
 {% include "_listen.conf" %}
 {% include "_certificates.conf" %}