From bacb2f4b9fb869339fd2bf235cc9aace964494f5 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Sun, 28 Jun 2026 11:59:52 +0200 Subject: [PATCH] fix: correct Traefik rule syntax for local IngressRoutes Move parentheses outside Host() calls so that || and && operators are properly grouped in Traefik rule expressions. --- .gitignore | 8 ++++---- adguardhome/k8s/ingress.yaml | 2 +- gitea/k8s/ingress.yaml | 2 +- traefik/k8s/fileservers.yaml.example | 23 +++++++++++++++++++++++ 4 files changed, 29 insertions(+), 6 deletions(-) create mode 100644 traefik/k8s/fileservers.yaml.example diff --git a/.gitignore b/.gitignore index 2c5f973..68aec4e 100644 --- a/.gitignore +++ b/.gitignore @@ -32,7 +32,7 @@ streaming/data/* streaming/qbittorrent/* streaming/prowlarr/* -# Homepage +# Homepage homepages/forust_files/.well-known/* # Traefik files @@ -40,7 +40,7 @@ traefik/letsencrypt/acme.json traefik/dynamic/fileservers.yml traefik/dynamic/*.local.y*ml.* traefik/dynamic/*.external.y*ml - +traefik/k8s/fileservers.y*ml traefik/logs/* @@ -52,7 +52,7 @@ certs/ # Monitoring monitoring/prometheus.yml -# Python +# Python .python-version venv/ pyc @@ -93,7 +93,7 @@ replacements.txt edu_master/temp/ temp/* -# Environment +# Environment .env .env.anna .env.forust diff --git a/adguardhome/k8s/ingress.yaml b/adguardhome/k8s/ingress.yaml index 128c962..86cf3e2 100644 --- a/adguardhome/k8s/ingress.yaml +++ b/adguardhome/k8s/ingress.yaml @@ -38,4 +38,4 @@ spec: services: - name: adguard-service port: 3000 - - match: Host((`adguard.workstation.internal`) || Host(`dns.workstation.internal`) || Host(`adguard.gigaforust.internal`) || Host(`dns.gigaforust.internal`)) && PathPrefix(`/dns-query`) + - match: (Host(`adguard.workstation.internal`) || Host(`dns.workstation.internal`) || Host(`adguard.gigaforust.internal`) || Host(`dns.gigaforust.internal`)) && PathPrefix(`/dns-query`) diff --git a/gitea/k8s/ingress.yaml b/gitea/k8s/ingress.yaml index 4b2cb85..9d8588d 100644 --- a/gitea/k8s/ingress.yaml +++ b/gitea/k8s/ingress.yaml @@ -38,7 +38,7 @@ spec: services: - name: gitea-service port: 3000 - - match: Host((`gcr.workstation.internal`) || Host(`gcr.gigaforust.internal)) && PathPrefix(`/v2`) + - match: (Host(`gcr.workstation.internal`) || Host(`gcr.gigaforust.internal`)) && PathPrefix(`/v2`) kind: Rule services: - name: gitea-service diff --git a/traefik/k8s/fileservers.yaml.example b/traefik/k8s/fileservers.yaml.example new file mode 100644 index 0000000..8bafc4c --- /dev/null +++ b/traefik/k8s/fileservers.yaml.example @@ -0,0 +1,23 @@ +http: + routers: + fs1-public: + rule: "Host(`fs1.domain.xyz`)" + entrypoints: + - websecure + service: fs1 + middlewares: + - security-chain@file + tls: {} + + fs1-workstation: + rule: "Host(`fs1.workstation.internal`)" + entrypoints: + - websecure + service: fs1 + tls: {} + + services: + fs1: + loadBalancer: + servers: + - url: "http://127.0.0.1:3923" # Copyparty port example