Skip to content

Update Pi-hole subfolder config to support Pi-hole v6 #762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions pihole.subdomain.conf.sample
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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;
Expand Down
26 changes: 8 additions & 18 deletions pihole.subfolder.conf.sample
Original file line number Diff line number Diff line change
@@ -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/;
Expand Down Expand Up @@ -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;
Expand Down