From 21aa26a5b89741a702d2d369430b0680939c48c7 Mon Sep 17 00:00:00 2001
From: Garrett Dees <garrettdees@gmail.com>
Date: Tue, 29 Apr 2025 17:31:10 -0500
Subject: [PATCH] Update Pi-hole subfolder config to support Pi-hole v6

---
 pihole.subdomain.conf.sample | 17 ++---------------
 pihole.subfolder.conf.sample | 26 ++++++++------------------
 2 files changed, 10 insertions(+), 33 deletions(-)

diff --git a/pihole.subdomain.conf.sample b/pihole.subdomain.conf.sample
index d2917c5b7..56bb22a22 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 dbc330e0b..1976d3c59 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;