diff --git a/bootstrap.docker-compose.yml b/bootstrap.docker-compose.yml index ba45790..30f045f 100644 --- a/bootstrap.docker-compose.yml +++ b/bootstrap.docker-compose.yml @@ -24,7 +24,7 @@ services: - traefik - docker environment: - - NASCOMPOSE_TRAEFIK_DOMAIN=${NASCOMPOSE_TRAEFIK_DOMAIN?} + - NASCOMPOSE_TRAEFIK_DOMAINS=${NASCOMPOSE_TRAEFIK_DOMAINS?} - NASCOMPOSE_MACVLAN_HOST_IP=${NASCOMPOSE_MACVLAN_HOST_IP} configs: - source: traefik_static diff --git a/docker/configs/traefik/dynamic/synology.yml b/docker/configs/traefik/dynamic/synology.yml index 545e1c7..49e9c9b 100644 --- a/docker/configs/traefik/dynamic/synology.yml +++ b/docker/configs/traefik/dynamic/synology.yml @@ -1,7 +1,7 @@ http: routers: synology: - rule: Host(`nas.{{ env `NASCOMPOSE_TRAEFIK_DOMAIN` }}`) + rule: '{{ $s := "nas" }}{{ range $i, $d := splitList "," (env `NASCOMPOSE_TRAEFIK_DOMAINS`) }}{{ if $i }} || {{end}}Host(`{{ $s }}.{{ $d }}`){{ end }}' service: synology@file services: synology: diff --git a/docker/configs/traefik/dynamic/traefik.yml b/docker/configs/traefik/dynamic/traefik.yml index 3889778..a9a72fd 100644 --- a/docker/configs/traefik/dynamic/traefik.yml +++ b/docker/configs/traefik/dynamic/traefik.yml @@ -1,7 +1,7 @@ http: routers: traefik: - rule: Host(`traefik`) || Host(`traefik.{{ env `NASCOMPOSE_TRAEFIK_DOMAIN` }}`) + rule: '{{ $s := "traefik" }}{{ range $i, $d := splitList "," (env `NASCOMPOSE_TRAEFIK_DOMAINS`) }}{{ if $i }} || {{end}}Host(`{{ $s }}.{{ $d }}`){{ end }}' service: api@internal middlewares: - traefik-auth diff --git a/docker/configs/traefik/traefik.yml b/docker/configs/traefik/traefik.yml index 01295a3..c4419e6 100644 --- a/docker/configs/traefik/traefik.yml +++ b/docker/configs/traefik/traefik.yml @@ -3,7 +3,7 @@ providers: endpoint: tcp://docker:2375 exposedByDefault: false network: traefik - defaultRule: Host(`{{ index .Labels "com.docker.compose.service" }}.{{ env `NASCOMPOSE_TRAEFIK_DOMAIN` }}`) + defaultRule: '{{ range $i, $e := splitList "," (env `NASCOMPOSE_TRAEFIK_DOMAINS`) }}{{ if $i }} || {{end}}Host(`{{ $e }}`){{ end }}' file: directory: /etc/traefik/dynamic/ diff --git a/nas-compose.env b/nas-compose.env index bc3247e..8108e23 100644 --- a/nas-compose.env +++ b/nas-compose.env @@ -13,7 +13,7 @@ NASCOMPOSE_MACVLAN_RANGE= NASCOMPOSE_MACVLAN_HOST_IP= NASCOMPOSE_MACVLAN_TRAEFIK_IP= -NASCOMPOSE_TRAEFIK_DOMAIN= +NASCOMPOSE_TRAEFIK_DOMAINS= NASCOMPOSE_DUCKDNS_DOMAIN=