From 582aea9b4b68aa86bb46a414245d977e09bd708b Mon Sep 17 00:00:00 2001 From: Kyattsukuro Date: Thu, 15 Jan 2026 15:50:58 +0100 Subject: [PATCH] imporved regex mathcing --- compose.yml | 2 ++ config/config.yml | 6 +++--- traefik.yml | 8 +++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/compose.yml b/compose.yml index 5d7734c..378b5fb 100644 --- a/compose.yml +++ b/compose.yml @@ -16,6 +16,8 @@ services: - HETZNER_API_TOKEN=${HETZNER_API_TOKEN} - DUCKDNS_TOKEN=${DUCKDNS_TOKEN} - AUTH_STRING=${AUTH_STRING} + - DUCKDNS_POLLING_INTERVAL=5 + - DUCKDNS_PROPAGATION_TIMEOUT=120 volumes: - /etc/localtime:/etc/localtime:ro - /var/run/docker.sock:/var/run/docker.sock:ro diff --git a/config/config.yml b/config/config.yml index 5b42ef2..0f1350b 100644 --- a/config/config.yml +++ b/config/config.yml @@ -17,7 +17,7 @@ http: - "*.urmel.de" forward-duckdns: service: noop@internal - rule: HostRegexp(`^https://([^.]+)\.urmel\.duckdns\.org(/.*$|$)`) + rule: HostRegexp(`(.+\.)?urmel\.duckdns\.org`) middlewares: redirect-duckdns@file tls: certResolver: duckdns @@ -35,5 +35,5 @@ http: users: '{{ env "AUTH_STRING" }}' redirect-duckdns: redirectRegex: - regex: "^http(s?)://([^.]+)\\.urmel\\.duckdns\\.org(/.*$|$)" - replacement: "http${1}://${2}.urmel.de${3}" + regex: "^http(s?)://(.+\\.)?urmel\\.duckdns\\.org(:[0-9]+)?(/.*$|$)" + replacement: "http${1}://${2}urmel.de${3}${4}" \ No newline at end of file diff --git a/traefik.yml b/traefik.yml index ec7c63a..db35d51 100644 --- a/traefik.yml +++ b/traefik.yml @@ -36,5 +36,11 @@ certificatesResolvers: storage: /certs/duckdns_acme.json dnsChallenge: provider: "duckdns" + disablePropagationCheck: true + delayBeforeCheck: 120s + propagation: + disableANSChecks: true + requireAllRNS: true resolvers: - - "8.8.4.4" \ No newline at end of file + - "8.8.8.8:53" + - "1.1.1.1:53" \ No newline at end of file