Merge branch 'developo' into develop

This commit is contained in:
Zoey
2023-03-18 11:30:42 +01:00
46 changed files with 410 additions and 307 deletions

View File

@@ -11,6 +11,7 @@ server {
{% include "_hsts.conf" %}
{% include "_forced_tls.conf" %}
{% include "_brotli.conf" %}
{% include "_access.conf" %}
include conf.d/include/acme-challenge.conf;
include conf.d/include/block-exploits.conf;
@@ -37,27 +38,6 @@ server {
}
{% endif %}
{% if access_list_id > 0 %}
{% if access_list.items.length > 0 %}
# Authorization
auth_basic "Authorization required";
auth_basic_user_file /data/etc/access/{{ access_list_id }};
{{ access_list.passauth }}
{% endif %}
# Access Rules
{% for client in access_list.clients %}
{{- client.rule -}};
{% endfor %}deny all;
# Access checks must...
{% if access_list.satisfy %}
{{ access_list.satisfy }};
{% endif %}
{% endif %}
{{ locations }}
# Custom