Add Pi-hole v6 fix for /admin/api redirection and proxy handling

nik4nao.home.arpa.conf

@@ -13,13 +13,34 @@ server {
     access_log off;
     error_log /var/log/nginx/nik4naohomearpa_error.log warn;
 
-    # ---- Convenience redirects ----
+    # ---- Dashy at / (root) ----
-    location = /         { return 302 /admin/; }   # land on Pi-hole admin by default
+    location = / {
-    location = /pihole   { return 302 /admin/; }   # /pihole -> /admin/
+        proxy_pass http://127.0.0.1:8084;
-    location /pihole/    { return 301 /admin/; }   # keep only /admin/ path
+        include snippets/proxy-common.conf;
+
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+    location = /pihole {
+        return 302 /admin/;
+    }
+
+    # ---- favicon (avoid noisy 404 in browser) ----
+    # Put a favicon.ico in /var/www/html if you want a real icon.
+    location = /favicon.ico {
+        root /var/www/html;
+        access_log off;
+        try_files /favicon.ico =404;
+    }
+
+    location /pihole/ {
+        return 301 /admin/;
+    }
 
     # ---- Jellyfin at /jellyfin/ ----
-    location = /jellyfin  { return 302 /jellyfin/; }   # enforce trailing slash
+    location = /jellyfin {
+        return 302 /jellyfin/;
+    }
 
     location /jellyfin/ {
         proxy_pass http://jellyfin_upstream/; # uses upstream (or use the raw URL)
@@ -30,13 +51,12 @@ server {
         proxy_set_header Connection $connection_upgrade;
         proxy_set_header X-Forwarded-Host $host;
         proxy_set_header X-Forwarded-Prefix /jellyfin;
-
-        # (Optional) if you see odd redirects, uncomment:
-        # proxy_redirect off;
     }
 
     # ---- Jellyfin at /anime/ ----
-    location = /anime  { return 302 /anime/; }   # enforce trailing slash
+    location = /anime {
+        return 302 /anime/;
+    }
 
     location /anime/ {
         proxy_pass http://djellyfin_upstream/; # uses upstream (or use the raw URL)
@@ -48,9 +68,24 @@ server {
         proxy_set_header Connection $connection_upgrade;
         proxy_set_header X-Forwarded-Host $host;
         proxy_set_header X-Forwarded-Prefix /anime;
+    }
 
-        # (Optional) if you see odd redirects, uncomment:
+    # ---- Pi-hole v6 fix: map /admin/api/* -> /api/* ----
-        # proxy_redirect off;
+    location = /admin/api {
+        return 301 /api/;
+    }
+
+    location ^~ /admin/api/ {
+        proxy_pass http://pihole_upstream/api/;
+        include snippets/proxy-common.conf;
+
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-Host $host;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+        proxy_redirect off;
     }
 
     # ---- Pi-hole admin at /admin/ ----
@@ -58,18 +93,34 @@ server {
     location /admin/ {
         proxy_pass http://pihole_upstream/admin/;
         include snippets/proxy-common.conf;
+
+        proxy_set_header Host $host;
         proxy_set_header X-Forwarded-Host $host;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+        proxy_redirect off;
     }
 
     # Pi-hole API (some UI calls hit /api/)
     location /api/ {
         proxy_pass http://pihole_upstream/api/;
         include snippets/proxy-common.conf;
+
+        proxy_set_header Host $host;
         proxy_set_header X-Forwarded-Host $host;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+        proxy_redirect off;
     }
 
     # redirect /watch-party -> /watch-party/
-    location = /watch-party { return 302 /watch-party/; }
+    location = /watch-party {
+        return 302 /watch-party/;
+    }
 
     # proxy ONLY /watch-party/*, keeping the prefix
     location ^~ /watch-party/ {
@@ -85,7 +136,9 @@ server {
     }
 
     # ---- qBittorrent at /qbt/ ----
-    location = /qbt { return 302 /qbt/; }
+    location = /qbt {
+        return 302 /qbt/;
+    }
 
     location ^~ /qbt/ {
         proxy_pass http://qbt_upstream/;
@@ -103,7 +156,9 @@ server {
     }
 
     # ---- JDownloader2 at /jd2/ ----
-    location = /jd2 { return 302 /jd2/; }
+    location = /jd2 {
+        return 302 /jd2/;
+    }
 
     location /jd2/ {
         proxy_pass http://127.0.0.1:5800/;
@@ -116,7 +171,9 @@ server {
     }
 
     # ---- JDownloader-Bridge at /jd-bridge/ ----
-    location = /jd-bridge { return 302 /jd-bridge/; }
+    location = /jd-bridge {
+        return 302 /jd-bridge/;
+    }
 
     location /jd-bridge/ {
         proxy_pass http://127.0.0.1:8088/;
@@ -125,4 +182,22 @@ server {
         proxy_set_header X-Forwarded-Host $host;
         proxy_set_header X-Forwarded-Prefix /jd-bridge;
     }
+
+    # ---- Dashy convenience redirects (Dashy is served at /) ----
+    location = /dashy {
+        return 302 /;
+    }
+    location ^~ /dashy/ {
+        return 302 /;
+    }
+
+    # ---- Default: serve Dashy for everything else ----
+    # All more specific locations above (/admin/, /api/, /jellyfin/, etc.) will still win.
+    location / {
+        proxy_pass http://127.0.0.1:8084;
+        include snippets/proxy-common.conf;
+
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
 }

nik4nao.xyz.conf

@@ -64,7 +64,9 @@ server {
     error_page 500 502 503 504 /errors/50x.html;
 
     # (Optional) Block noncompliant AI bots (requires $block_ai map in nginx.conf)
-    if ($block_ai) { return 403; }
+    if ($block_ai) {
+        return 403;
+    }
 
     # Serve /robots.txt on HTTPS
     location = /robots.txt {
@@ -73,7 +75,9 @@ server {
     }
 
     # Enforce trailing slash for subpath and land / on /watch-party/
-    location = /watch-party { return 301 /watch-party/; }
+    location = /watch-party {
+        return 301 /watch-party/;
+    }
     location = / {
         try_files /nik4nao-xyz-landing.html =404;
     }