From 3539cc3d3e2c4849e1f61251ae6805abf9e7d0d4 Mon Sep 17 00:00:00 2001 From: aki Date: Fri, 25 Apr 2025 12:54:58 +0800 Subject: [PATCH] fix(docker-compose): Simplify Traefik routing rules by removing hostname conditions --- .env.example | 4 +++- docker-compose.yml | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.env.example b/.env.example index 7ac73f7..ab66b89 100644 --- a/.env.example +++ b/.env.example @@ -8,7 +8,6 @@ CONFIG_ROOT="." DATA_ROOT="/mnt/data" DOWNLOAD_ROOT="/mnt/data/torrents" IMMICH_UPLOAD_LOCATION="/mnt/data/photos" -HOSTNAME=localhost HOMEASSISTANT_HOSTNAME= IMMICH_HOSTNAME= ADGUARD_HOSTNAME= @@ -47,6 +46,9 @@ DECLUTTARR_REMOVE_ORPHANS=True # --- Tailscale Settings --- TAILSCALE_AUTHKEY= TAILSCALE_HOSTNAME=tailscale-nas +TAILSCALE_TAILNET_DOMAIN=your-tailnet.ts.net TAILSCALE_TAGS=tag:nas # Enable Tailscale Funnel (public access) for HTTPS? Set to 'true' or 'false'. ENABLE_FUNNEL_HTTPS=false + +HOSTNAME=${TAILSCALE_HOSTNAME}.${TAILSCALE_TAILNET_DOMAIN} \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 4dcd7c9..155028b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,7 +42,7 @@ services: retries: 10 labels: - traefik.enable=true - - traefik.http.routers.sonarr.rule=(Host(`${HOSTNAME}`) && PathPrefix(`/sonarr`)) + - traefik.http.routers.sonarr.rule=PathPrefix(`/sonarr`) - traefik.http.routers.sonarr.entrypoints=web - traefik.http.services.sonarr.loadbalancer.server.port=8989 - homepage.group=Media @@ -71,7 +71,7 @@ services: retries: 10 labels: - traefik.enable=true - - traefik.http.routers.radarr.rule=(Host(`${HOSTNAME}`) && PathPrefix(`/radarr`)) + - traefik.http.routers.radarr.rule=PathPrefix(`/radarr`) - traefik.http.routers.radarr.entrypoints=web - traefik.http.services.radarr.loadbalancer.server.port=7878 - homepage.group=Media @@ -100,7 +100,7 @@ services: retries: 10 labels: - traefik.enable=true - - traefik.http.routers.lidarr.rule=(Host(`${HOSTNAME}`) && PathPrefix(`/lidarr`)) + - traefik.http.routers.lidarr.rule=PathPrefix(`/lidarr`) - traefik.http.routers.lidarr.entrypoints=web - traefik.http.services.lidarr.loadbalancer.server.port=8686 - homepage.group=Media @@ -131,7 +131,7 @@ services: retries: 10 labels: - traefik.enable=true - - traefik.http.routers.bazarr.rule=(Host(`${HOSTNAME}`) && PathPrefix(`/bazarr`)) + - traefik.http.routers.bazarr.rule=PathPrefix(`/bazarr`) - traefik.http.routers.bazarr.entrypoints=web - traefik.http.services.bazarr.loadbalancer.server.port=6767 - homepage.group=Download @@ -165,7 +165,7 @@ services: retries: 10 labels: - traefik.enable=true - - traefik.http.routers.jellyseerr.rule=(Host(`${HOSTNAME}`) && PathPrefix(`/jellyseerr`)) + - traefik.http.routers.jellyseerr.rule=PathPrefix(`/jellyseerr`) - traefik.http.routers.jellyseerr.entrypoints=web - traefik.http.services.jellyseerr.loadbalancer.server.port=5055 - traefik.http.routers.jellyseerr.middlewares=jellyseerr-stripprefix,jellyseerr-rewrite,jellyseerr-rewriteHeaders @@ -239,7 +239,7 @@ services: retries: 10 labels: - traefik.enable=true - - traefik.http.routers.prowlarr.rule=(Host(`${HOSTNAME}`) && PathPrefix(`/prowlarr`)) + - traefik.http.routers.prowlarr.rule=PathPrefix(`/prowlarr`) - traefik.http.routers.prowlarr.entrypoints=web - traefik.http.services.prowlarr.loadbalancer.server.port=9696 - homepage.group=Download @@ -289,7 +289,7 @@ services: retries: 10 labels: - traefik.enable=true - - traefik.http.routers.qbittorrent.rule=(Host(`${HOSTNAME}`) && PathPrefix(`/qbittorrent`)) + - traefik.http.routers.qbittorrent.rule=PathPrefix(`/qbittorrent`) - traefik.http.routers.qbittorrent.entrypoints=web - traefik.http.services.qbittorrent.loadbalancer.server.port=8080 - traefik.http.routers.qbittorrent.middlewares=qbittorrent-strip-slash,qbittorrent-stripprefix @@ -338,7 +338,7 @@ services: restart: always labels: - traefik.enable=true - - traefik.http.routers.sabnzbd.rule=(Host(`${HOSTNAME}`) && PathPrefix(`/sabnzbd`) || PathPrefix(`/sabnzbd`)) + - traefik.http.routers.sabnzbd.rule=PathPrefix(`/sabnzbd`) # Simplified rule - traefik.http.routers.sabnzbd.entrypoints=web - traefik.http.services.sabnzbd.loadbalancer.server.port=8080 - homepage.group=Download @@ -373,7 +373,7 @@ services: retries: 10 labels: - traefik.enable=true - - traefik.http.routers.jellyfin.rule=(Host(`${HOSTNAME}`) && PathPrefix(`/jellyfin`)) + - traefik.http.routers.jellyfin.rule=PathPrefix(`/jellyfin`) - traefik.http.routers.jellyfin.entrypoints=web - traefik.http.services.jellyfin.loadbalancer.server.port=8096 - homepage.group=Media @@ -404,7 +404,7 @@ services: - traefik.http.middlewares.calibre-headers.headers.customRequestHeaders.X-Script-Name=/calibre - traefik.http.middlewares.calibre-stripprefixregex.stripPrefixRegex.regex=/calibre - traefik.http.routers.calibre.middlewares=calibre-headers,calibre-stripprefixregex - - traefik.http.routers.calibre.rule=(Host(`${HOSTNAME}`) && PathPrefix(`/calibre`)) + - traefik.http.routers.calibre.rule=PathPrefix(`/calibre`) - traefik.http.routers.calibre.entrypoints=web - traefik.http.services.calibre.loadbalancer.server.port=8083 - homepage.group=Media @@ -477,7 +477,7 @@ services: [sh, -c, "cp -n /app/config/tpl/*.yaml /app/config && node server.js"] labels: - traefik.enable=true - - traefik.http.routers.homepage.rule=(Host(`${HOSTNAME}`) && PathPrefix(`/`)) + - traefik.http.routers.homepage.rule=PathPrefix(`/`) - traefik.http.routers.homepage.entrypoints=web - traefik.http.services.homepage.loadbalancer.server.port=3000 watchtower: