Merge branch 'master' into disable_tor_default

This commit is contained in:
muppeth 2023-01-17 21:04:57 +00:00
commit 932b397e34
2 changed files with 1 additions and 7 deletions

View File

@ -11,7 +11,7 @@
{% if item.onion is defined and enable_tor == 'true' and onion_address | length > 0 %}
server {
listen unix:/var/run/{{ item.name }}.sock;
server_name {{ onion_address.content | b64decode }}.onion;
server_name {{ onion_address.content | b64decode | trim }};
{% else %}
server {
server_name {% if item.name is string %}{{ item.name }}{% else %}{{ item.name | join(' ') }}{% endif %};

View File

@ -16,11 +16,6 @@
{% endif %}
{% if item.root_custom_headers is defined %}
#headers
{% for header in item.root_custom_headers %}
{{ header }}
{% endfor %}
{% if header.predef is defined and header.predef == 'none' %}
{% else %}
{% if header.permission_policy is defined and header.permission_policy == 'none' %}
{% else %}
add_header Permissions-Policy "geolocation=(),interest-cohort=()";
@ -57,7 +52,6 @@
{% else %}
add_header X-Robots-Tag "{{ header.robots | default('none') }}";
{% endif %}
{% endif %}
{% endif %}
}