diff --git a/pihole.subdomain.conf.sample b/pihole.subdomain.conf.sample index d2917c5b..56bb22a2 100644 --- a/pihole.subdomain.conf.sample +++ b/pihole.subdomain.conf.sample @@ -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 dns has a cname set for pihole @@ -45,20 +45,7 @@ server { proxy_hide_header X-Frame-Options; } - location /admin { - # 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; - + location /api { include /config/nginx/proxy.conf; include /config/nginx/resolver.conf; set $upstream_app pihole; diff --git a/pihole.subfolder.conf.sample b/pihole.subfolder.conf.sample index dbc330e0..1976d3c5 100644 --- a/pihole.subfolder.conf.sample +++ b/pihole.subfolder.conf.sample @@ -1,6 +1,9 @@ -## Version 2023/02/05 +## Version 2025/04/29 # 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 { return 301 $scheme://$host/pihole/; @@ -31,24 +34,11 @@ location ^~ /pihole/ { proxy_hide_header X-Frame-Options; } -location /pihole/admin { - return 301 $scheme://$host/pihole/admin/; +location /pihole/api { + return 301 $scheme://$host/pihole/api/; } -location ^~ /pihole/admin/ { - # 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; - +location ^~ /pihole/api/ { include /config/nginx/proxy.conf; include /config/nginx/resolver.conf; set $upstream_app pihole;