Merge branch 'oc-main' into cloudwatchLogs

This commit is contained in:
Nick Craig
2023-05-03 11:23:19 -04:00
committed by GitHub
120 changed files with 3522 additions and 3809 deletions

View File

@@ -46,29 +46,19 @@ proxy_http_version 1.1;
location / {
{% if access_list_id > 0 %}
{% if access_list.items.length > 0 %}
# Authorization
auth_basic "Authorization required";
auth_basic_user_file /data/access/{{ access_list_id }};
{% include "_access.conf" %}
{% include "_hsts.conf" %}
{{ access_list.passauth }}
{% if allow_websocket_upgrade == 1 or allow_websocket_upgrade == true %}
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $http_connection;
proxy_http_version 1.1;
{% endif %}
# Access Rules
{% for client in access_list.clients %}
{{- client.rule -}};
{% endfor %}deny all;
# Proxy!
include conf.d/include/proxy.conf;
# Access checks must...
{% if access_list.satisfy %}
{{ access_list.satisfy }};
{% endif %}
{% endif %}
#do the proxy!
proxy_pass $forward_scheme://$server:$port$path$request_uri;
}
}
{% endif %}
# Custom