imporved regex mathcing

This commit is contained in:
Kyattsukuro 2026-01-15 15:50:58 +01:00
parent f253828e0e
commit 582aea9b4b
3 changed files with 12 additions and 4 deletions

View File

@ -16,6 +16,8 @@ services:
- HETZNER_API_TOKEN=${HETZNER_API_TOKEN} - HETZNER_API_TOKEN=${HETZNER_API_TOKEN}
- DUCKDNS_TOKEN=${DUCKDNS_TOKEN} - DUCKDNS_TOKEN=${DUCKDNS_TOKEN}
- AUTH_STRING=${AUTH_STRING} - AUTH_STRING=${AUTH_STRING}
- DUCKDNS_POLLING_INTERVAL=5
- DUCKDNS_PROPAGATION_TIMEOUT=120
volumes: volumes:
- /etc/localtime:/etc/localtime:ro - /etc/localtime:/etc/localtime:ro
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:ro

View File

@ -17,7 +17,7 @@ http:
- "*.urmel.de" - "*.urmel.de"
forward-duckdns: forward-duckdns:
service: noop@internal service: noop@internal
rule: HostRegexp(`^https://([^.]+)\.urmel\.duckdns\.org(/.*$|$)`) rule: HostRegexp(`(.+\.)?urmel\.duckdns\.org`)
middlewares: redirect-duckdns@file middlewares: redirect-duckdns@file
tls: tls:
certResolver: duckdns certResolver: duckdns
@ -35,5 +35,5 @@ http:
users: '{{ env "AUTH_STRING" }}' users: '{{ env "AUTH_STRING" }}'
redirect-duckdns: redirect-duckdns:
redirectRegex: redirectRegex:
regex: "^http(s?)://([^.]+)\\.urmel\\.duckdns\\.org(/.*$|$)" regex: "^http(s?)://(.+\\.)?urmel\\.duckdns\\.org(:[0-9]+)?(/.*$|$)"
replacement: "http${1}://${2}.urmel.de${3}" replacement: "http${1}://${2}urmel.de${3}${4}"

View File

@ -36,5 +36,11 @@ certificatesResolvers:
storage: /certs/duckdns_acme.json storage: /certs/duckdns_acme.json
dnsChallenge: dnsChallenge:
provider: "duckdns" provider: "duckdns"
disablePropagationCheck: true
delayBeforeCheck: 120s
propagation:
disableANSChecks: true
requireAllRNS: true
resolvers: resolvers:
- "8.8.4.4" - "8.8.8.8:53"
- "1.1.1.1:53"