fix default of npmplus_upstream_compression/npmplus_x_frame_options in custom locations

Author: Zoey2936

backend/templates/_proxy_host_custom_location.conf

@@ -12,17 +12,17 @@ location {{ location_type }}{{ path }} {
   {% if npmplus_noindex == true %}include noindex-nofollow.conf;{% endif %}
   {% if npmplus_crowdsec_appsec == true %}set $crowdsec_disable_appsec 1;{% endif %}
 
-  {% if npmplus_x_frame_options == "DENY" or npmplus_x_frame_options == "SAMEORIGIN" %}
-     more_set_headers "X-Frame-Options: {{ npmplus_x_frame_options }}";
-  {% elsif npmplus_x_frame_options == "none" %}
+  {% if npmplus_x_frame_options == "none" %}
      more_clear_headers "X-Frame-Options";
+  {% elsif npmplus_x_frame_options == "upstream" %}{% else %}
+     more_set_headers "X-Frame-Options: {{ npmplus_x_frame_options }}";
   {% endif %}
 
   {% if forward_scheme == "http" or forward_scheme == "https" %}
 
     set $upstream {{ forward_host }};
     include proxy-headers.conf;
-    {% if npmplus_upstream_compression == false %}proxy_set_header Accept-Encoding "";{% endif %}
+    {% if npmplus_upstream_compression != true %}proxy_set_header Accept-Encoding "";{% endif %}
     {% if npmplus_proxy_request_buffering == true %}proxy_request_buffering off;{% endif %}
     {% if npmplus_proxy_response_buffering == true %}proxy_buffering off;{% endif %}
     proxy_pass {{ forward_scheme }}://{% if forward_path != null %}{{ forward_host }}{% else %}$upstream{% endif %}{% if forward_port != null %}:{{ forward_port }}{% endif %}{% if forward_path != null %}{{ forward_path }}{% else %}$request_uri{% endif %};
@@ -31,7 +31,7 @@ location {{ location_type }}{{ path }} {
 
     set $upstream {{ forward_host }};
     include grpc-headers.conf;
-    {% if npmplus_upstream_compression == false %}grpc_set_header Accept-Encoding "";{% endif %}
+    {% if npmplus_upstream_compression != true %}grpc_set_header Accept-Encoding "";{% endif %}
     grpc_pass {{ forward_scheme }}://{% if forward_path != null %}{{ forward_host }}{% else %}$upstream{% endif %}{% if forward_port != null %}:{{ forward_port }}{% endif %}{% if forward_path != null %}{{ forward_path }}{% else %}$request_uri{% endif %};
 
   {% elsif forward_scheme == "path" %}

backend/templates/proxy_host.conf

@@ -35,17 +35,17 @@
         {% if npmplus_noindex == true %}include noindex-nofollow.conf;{% endif %}
         {% if npmplus_crowdsec_appsec == true %}set $crowdsec_disable_appsec 1;{% endif %}
 
-        {% if npmplus_x_frame_options == "DENY" or npmplus_x_frame_options == "SAMEORIGIN" %}
-           more_set_headers "X-Frame-Options: {{ npmplus_x_frame_options }}";
-        {% elsif npmplus_x_frame_options == "none" %}
-           more_clear_headers "X-Frame-Options";
-        {% endif %}
+          {% if npmplus_x_frame_options == "none" %}
+            more_clear_headers "X-Frame-Options";
+          {% elsif npmplus_x_frame_options == "upstream" %}{% else %}
+            more_set_headers "X-Frame-Options: {{ npmplus_x_frame_options }}";
+          {% endif %}
 
         {% if forward_scheme == "http" or forward_scheme == "https" %}
 
           set $upstream {{ forward_host }};
           include proxy-headers.conf;
-          {% if npmplus_upstream_compression == false %}proxy_set_header Accept-Encoding "";{% endif %}
+          {% if npmplus_upstream_compression != true %}proxy_set_header Accept-Encoding "";{% endif %}
           {% if npmplus_proxy_request_buffering == true %}proxy_request_buffering off;{% endif %}
           {% if npmplus_proxy_response_buffering == true %}proxy_buffering off;{% endif %}
           proxy_pass {{ forward_scheme }}://{% if forward_path != null %}{{ forward_host }}{% else %}$upstream{% endif %}{% if forward_port != null %}:{{ forward_port }}{% endif %}{% if forward_path != null %}{{ forward_path }}{% else %}$request_uri{% endif %};
@@ -54,7 +54,7 @@
 
           set $upstream {{ forward_host }};
           include grpc-headers.conf;
-          {% if npmplus_upstream_compression == false %}grpc_set_header Accept-Encoding "";{% endif %}
+          {% if npmplus_upstream_compression != true %}grpc_set_header Accept-Encoding "";{% endif %}
           grpc_pass {{ forward_scheme }}://{% if forward_path != null %}{{ forward_host }}{% else %}$upstream{% endif %}{% if forward_port != null %}:{{ forward_port }}{% endif %}{% if forward_path != null %}{{ forward_path }}{% else %}$request_uri{% endif %};
 
         {% elsif forward_scheme == "path" %}

rootfs/usr/local/bin/envs.sh

@@ -726,7 +726,7 @@ if [ "$GOA" = "true" ] && [ "$LOGROTATE" = "false" ]; then
 fi
 
 
-export TV="10"
+export TV="11"
 if [ ! -s /data/npmplus/env.sha512sum ] || [ "$(cat /data/npmplus/env.sha512sum)" != "$( (grep "env\.[A-Z0-9_]\+" -roh /app/templates | sed "s|env.||g" | sort | uniq | xargs printenv; echo "$TV") | tr -d "\n" | sha512sum | cut -d" " -f1)" ]; then
     echo "At least one env or the template version changed, all hosts will be regenerated. Please make sure to read the changelog."
     export REGENERATE_ALL="true"