diff --git a/adguard/docker-compose.yml b/adguard/docker-compose.yml index 79aafb5..e23cec7 100644 --- a/adguard/docker-compose.yml +++ b/adguard/docker-compose.yml @@ -10,7 +10,6 @@ services: - 853:853/tcp - 3999:3000/tcp - 8089:80/tcp - volumes: - adguardhome-workdir:/opt/adguardhome/work - adguardhome-confdir:/opt/adguardhome/conf diff --git a/traefik/docker-compose.yml b/traefik/docker-compose.yml index 7851f3e..006c247 100644 --- a/traefik/docker-compose.yml +++ b/traefik/docker-compose.yml @@ -13,6 +13,7 @@ services: # The HTTP port - "1080:80" - "1443:443" + - "853:853" # The Web UI (enabled by --api.insecure=true) - "8088:8080" volumes: diff --git a/traefik/rules.yaml b/traefik/rules.yaml index 65ad58c..9f324a2 100644 --- a/traefik/rules.yaml +++ b/traefik/rules.yaml @@ -82,9 +82,16 @@ http: tls: certResolver: myresolver router-adguardhome: - rule: "Host(`adguardhome.huguette.ovh`)" + rule: "Host(`dns.huguette.ovh`)" service: "service-adguardhome" tls: + entrypoints: websecure + certResolver: myresolver + router-adguardhome=tls: + rule: "HostSNI(`dns.huguette.ovh`)" + service: "service-adguardhome=tls" + tls: + entrypoints: dot certResolver: myresolver services: @@ -163,6 +170,11 @@ http: passHostHeader: true servers: - url: "http://192.168.1.100:8089" + service-adguardhome-tls: + loadBalancer: + passHostHeader: true + servers: + - url: "http://192.168.1.100:53" middlewares: replacepathregex-nas: diff --git a/traefik/traefik.yml b/traefik/traefik.yml index e504f60..3786053 100644 --- a/traefik/traefik.yml +++ b/traefik/traefik.yml @@ -2,23 +2,17 @@ entryPoints: web: address: ":80" - #asDefault: truxe - -# websecure: -# address: ":443" -# http: -# redirections: -# entryPoint: -# to: websecure -# scheme: https -# permanent: true + http: + redirections: + entryPoint: + to: websecure + scheme: https websecure: address: ":443" -# http: -# tls: -# certresolver: myresolver + dot: + address: ":853" certificatesResolvers: myresolver: