mirror of
https://github.com/linuxserver/reverse-proxy-confs.git
synced 2025-07-07 05:21:31 -07:00
Merge 21aa26a5b8
into 40eea01572
This commit is contained in:
commit
90704a5441
2 changed files with 10 additions and 33 deletions
|
@ -1,4 +1,4 @@
|
||||||
## Version 2024/07/16
|
## Version 2025/04/29
|
||||||
# make sure that your pihole container is named pihole
|
# make sure that your pihole container is named pihole
|
||||||
# make sure that your dns has a cname set for pihole
|
# make sure that your dns has a cname set for pihole
|
||||||
|
|
||||||
|
@ -45,20 +45,7 @@ server {
|
||||||
proxy_hide_header X-Frame-Options;
|
proxy_hide_header X-Frame-Options;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /admin {
|
location /api {
|
||||||
# enable the next two lines for http auth
|
|
||||||
#auth_basic "Restricted";
|
|
||||||
#auth_basic_user_file /config/nginx/.htpasswd;
|
|
||||||
|
|
||||||
# enable for ldap auth (requires ldap-server.conf in the server block)
|
|
||||||
#include /config/nginx/ldap-location.conf;
|
|
||||||
|
|
||||||
# enable for Authelia (requires authelia-server.conf in the server block)
|
|
||||||
#include /config/nginx/authelia-location.conf;
|
|
||||||
|
|
||||||
# enable for Authentik (requires authentik-server.conf in the server block)
|
|
||||||
#include /config/nginx/authentik-location.conf;
|
|
||||||
|
|
||||||
include /config/nginx/proxy.conf;
|
include /config/nginx/proxy.conf;
|
||||||
include /config/nginx/resolver.conf;
|
include /config/nginx/resolver.conf;
|
||||||
set $upstream_app pihole;
|
set $upstream_app pihole;
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
## Version 2023/02/05
|
## Version 2025/04/29
|
||||||
# make sure that your pihole container is named pihole
|
# make sure that your pihole container is named pihole
|
||||||
# pihole does not require a base url setting
|
# make sure that pihole is set to work with the base url /pihole
|
||||||
|
|
||||||
|
# in pihole settings, under Webserver and API, set "webserver.paths.prefix" to "/pihole",
|
||||||
|
# or run `[docker container exec pihole] pihole-FTL --config webserver.paths.prefix /pihole`
|
||||||
|
|
||||||
location /pihole {
|
location /pihole {
|
||||||
return 301 $scheme://$host/pihole/;
|
return 301 $scheme://$host/pihole/;
|
||||||
|
@ -31,24 +34,11 @@ location ^~ /pihole/ {
|
||||||
proxy_hide_header X-Frame-Options;
|
proxy_hide_header X-Frame-Options;
|
||||||
}
|
}
|
||||||
|
|
||||||
location /pihole/admin {
|
location /pihole/api {
|
||||||
return 301 $scheme://$host/pihole/admin/;
|
return 301 $scheme://$host/pihole/api/;
|
||||||
}
|
}
|
||||||
|
|
||||||
location ^~ /pihole/admin/ {
|
location ^~ /pihole/api/ {
|
||||||
# enable the next two lines for http auth
|
|
||||||
#auth_basic "Restricted";
|
|
||||||
#auth_basic_user_file /config/nginx/.htpasswd;
|
|
||||||
|
|
||||||
# enable for ldap auth (requires ldap-server.conf in the server block)
|
|
||||||
#include /config/nginx/ldap-location.conf;
|
|
||||||
|
|
||||||
# enable for Authelia (requires authelia-server.conf in the server block)
|
|
||||||
#include /config/nginx/authelia-location.conf;
|
|
||||||
|
|
||||||
# enable for Authentik (requires authentik-server.conf in the server block)
|
|
||||||
#include /config/nginx/authentik-location.conf;
|
|
||||||
|
|
||||||
include /config/nginx/proxy.conf;
|
include /config/nginx/proxy.conf;
|
||||||
include /config/nginx/resolver.conf;
|
include /config/nginx/resolver.conf;
|
||||||
set $upstream_app pihole;
|
set $upstream_app pihole;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue