Merge branch 'main' into fix/compose-router-rules

fix(traefik): correct AdGuard and SearXNG Compose router expressions
2026-10-06 15:10:26 +00:00 · 2026-10-06 16:05:17 +02:00
2 changed files with 3 additions and 3 deletions
@@ -31,7 +31,7 @@ services:
      - "traefik.http.routers.adguard-dev.entrypoints=websecure"
      - "traefik.http.routers.adguard-dev.tls=true"
      # DoH Router
-      - "traefik.http.routers.dns-over-https.rule=(Host(`dns.forust.xyz` || Host(`adguard.forust.xyz`)) && PathPrefix(`/dns-query`))"
+      - "traefik.http.routers.dns-over-https.rule=(Host(`dns.forust.xyz`) || Host(`adguard.forust.xyz`)) && PathPrefix(`/dns-query`)"
      - "traefik.http.routers.dns-over-https.entrypoints=websecure"
      - "traefik.http.routers.dns-over-https.tls.certresolver=letsencrypt"

@@ -12,11 +12,11 @@ services:
      - "traefik.enable=true"
      - "traefik.http.services.searxng.loadbalancer.server.port=8080"
      # Prod Router
-      - "traefik.http.routers.searxng.rule=Host(`s.forust.xyz` || `search.forust.xyz`)"
+      - "traefik.http.routers.searxng.rule=Host(`s.forust.xyz`) || Host(`search.forust.xyz`)"
      - "traefik.http.routers.searxng.entrypoints=websecure"
      - "traefik.http.routers.searxng.tls.certresolver=letsencrypt"
      # Local Router
-      - "traefik.http.routers.searxng-local.rule=Host(`s.workstation.internal` || `searxng.workstation.internal`)"
+      - "traefik.http.routers.searxng-local.rule=Host(`s.workstation.internal`) || Host(`searxng.workstation.internal`)"
      - "traefik.http.routers.searxng-local.entrypoints=websecure"
      - "traefik.http.routers.searxng-local.tls=true"
      # Dev Router
Author	SHA1	Message	Date
forust	dde5eac628	Merge branch 'main' into fix/compose-router-rules ci / validate (push) Skipped ci / lint-prettier (push) Skipped ci / lint-ruff (push) Skipped ci / lint-yaml (push) Skipped ci / lint-dockerfiles (push) Skipped renovate-ci / validate-renovate (push) Skipped renovate-ci / validate-renovate (pull_request) Skipped ci / lint-compose (pull_request) Successful in 11s Details ci / lint-actionlint (pull_request) Successful in 4s Details ci / lint-shellcheck (pull_request) Successful in 18s Details ci / lint-prettier (pull_request) Successful in 21s Details ci / lint-ruff (pull_request) Successful in 10s Details ci / lint-yaml (pull_request) Successful in 14s Details ci / lint-dockerfiles (pull_request) Successful in 8s Details ci / validate (pull_request) Successful in 6s Details ci / build (pull_request) Skipped Details	2026-10-06 15:10:26 +00:00
forust	7bb4e9d872	fix(traefik): correct AdGuard and SearXNG Compose router expressions renovate-ci / validate-renovate (push) Skipped ci / lint-compose (push) Successful in 9s Details ci / lint-actionlint (push) Successful in 5s Details ci / lint-shellcheck (push) Successful in 9s Details ci / lint-prettier (push) Successful in 15s Details ci / lint-ruff (push) Successful in 6s Details ci / lint-yaml (push) Successful in 10s Details ci / lint-dockerfiles (push) Successful in 5s Details ci / validate (push) Successful in 7s Details ci / build (push) Skipped Details ci / lint-compose (pull_request) Successful in 8s Details ci / lint-actionlint (pull_request) Successful in 7s Details ci / lint-shellcheck (pull_request) Successful in 8s Details ci / lint-prettier (pull_request) Successful in 18s Details ci / lint-ruff (pull_request) Successful in 7s Details ci / lint-yaml (pull_request) Successful in 11s Details ci / lint-dockerfiles (pull_request) Successful in 6s Details ci / validate (pull_request) Successful in 8s Details ci / build (pull_request) Skipped Details renovate-ci / validate-renovate (pull_request) Successful in 10s Details	2026-10-06 16:05:17 +02:00