diff --git a/nik4nao.home.arpa.conf b/nik4nao.home.arpa.conf
index facf504..7f3c63b 100644
--- a/nik4nao.home.arpa.conf
+++ b/nik4nao.home.arpa.conf
@@ -13,9 +13,13 @@ server {
access_log off;
error_log /var/log/nginx/nik4naohomearpa_error.log warn;
- # ---- Convenience redirects ----
+ # ---- Dashy at / (root) ----
location = / {
- return 302 /admin/;
+ 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;
}
location = /pihole {
return 302 /admin/;
@@ -147,35 +151,21 @@ server {
proxy_set_header X-Forwarded-Prefix /jd-bridge;
}
- # ---- Dashy at /dashy/ ----
+ # ---- Dashy convenience redirects (Dashy is served at /) ----
location = /dashy {
- return 302 /dashy/;
+ return 302 /;
+ }
+ location ^~ /dashy/ {
+ return 302 /;
}
- location ^~ /dashy/ {
- proxy_pass http://127.0.0.1:8084/;
+ # ---- 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;
- add_header X-Dashy-Proxy 1 always;
- access_log /var/log/nginx/dashy_access.log;
-
proxy_set_header Host $host;
proxy_set_header X-Forwarded-Proto $scheme;
- proxy_set_header X-Forwarded-Prefix /dashy;
-
- proxy_redirect / /dashy/;
- proxy_cookie_path / /dashy/;
- proxy_set_header Accept-Encoding "";
-
- sub_filter_once off;
- sub_filter_types text/html text/css application/javascript application/json;
-
- sub_filter '' '';
-
- sub_filter 'href="/' 'href="/dashy/';
- sub_filter 'src="/' 'src="/dashy/';
- sub_filter 'content="/' 'content="/dashy/';
- sub_filter 'action="/' 'action="/dashy/';
- sub_filter 'url(/' 'url(/dashy/';
}
}