ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-08-03 16:03:38 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'developo' into develop

Browse Source
This commit is contained in:
Zoey
2023-03-18 11:30:42 +01:00
parent 4af50b7ef5 82d9452001
commit 1d9c7b0570
46 changed files with 410 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
backend/templates/_access.conf Normal file
View File

@@ -0,0 +1,25 @@
{% 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 }};
{% if access_list.pass_auth == 0 %}
proxy_set_header Authorization "";
{% endif %}
{% endif %}
# Access Rules: {{ access_list.clients | size }} total
{% for client in access_list.clients %}
{{client | nginxAccessRule}}
{% endfor %}
deny all;
# Access checks must...
{% if access_list.satisfy_any == 1 %}
satisfy any;
{% else %}
satisfy all;
{% endif %}
{% endif %}

6
backend/templates/_location.conf
View File

@@ -8,12 +8,6 @@
proxy_http_version 1.1;
proxy_pass {{ forward_scheme }}://{{ forward_host }}:{{ forward_port }}{{ forward_path }};
{% if access_list_id > 0 %}
{% if access_list.items.length > 0 %}
{{ access_list.passauth }}
{% endif %}
{% endif %}
{% if allow_websocket_upgrade == 1 or allow_websocket_upgrade == true %}
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $connection_upgrade;

22
backend/templates/proxy_host.conf
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