diff --git a/bootstrap.docker-compose.yml b/bootstrap.docker-compose.yml index 8481774..eeba2d6 100644 --- a/bootstrap.docker-compose.yml +++ b/bootstrap.docker-compose.yml @@ -22,7 +22,10 @@ services: - traefik - docker volumes: - - traefik_config:/etc/traefik/ + - traefik_dynamic_config:/etc/traefik/dynamic/ + configs: + - source: traefik_config + target: /etc/traefik/traefik.yml depends_on: - docker restart: unless-stopped @@ -69,7 +72,7 @@ volumes: device: ${SERVICES_DIR?}/portainer/volumes/data/ labels: nas-compose.boostrap: true - traefik_config: + traefik_dynamic_config: driver_opts: type: none o: bind @@ -77,6 +80,10 @@ volumes: labels: nas-compose.boostrap: true +configs: + traefik_config: + file: ${SERVICES_DIR?}/traefik/configs/traefik.yml + secrets: portainer_password: file: ${SERVICES_DIR?}/portainer/secrets/portainer_password diff --git a/services/traefik/configs/traefik.yml b/services/traefik/configs/traefik.yml new file mode 100644 index 0000000..ada94ae --- /dev/null +++ b/services/traefik/configs/traefik.yml @@ -0,0 +1,32 @@ +providers: + docker: + endpoint: tcp://docker:2375 + exposedByDefault: false + network: traefik + defaultRule: Host(`{{ index .Labels "com.docker.compose.service" }}.dev.dedicated.contact`) + file: + directory: /etc/traefik/dynamic/ + +serverstransport: + insecureskipverify: true + +api: + insecure: true + +accessLog: {} + +entryPoints: + web: + address: :80 + http: +# redirections: +# entryPoint: +# to: websecure +# scheme: https + websecure: + address: :443 + http: + tls: {} + +global: + sendAnonymousUsage: false diff --git a/services/traefik/volumes/config/dynamic/traefik.yml b/services/traefik/volumes/config/dynamic/traefik.yml deleted file mode 100644 index dc37a1b..0000000 --- a/services/traefik/volumes/config/dynamic/traefik.yml +++ /dev/null @@ -1,5 +0,0 @@ -http: - routers: - traefik: - rule: Host(`traefik.dev.dedicated.contact`) - service: api@internal diff --git a/services/traefik/volumes/config/traefik.yml b/services/traefik/volumes/config/traefik.yml index ada94ae..dc37a1b 100644 --- a/services/traefik/volumes/config/traefik.yml +++ b/services/traefik/volumes/config/traefik.yml @@ -1,32 +1,5 @@ -providers: - docker: - endpoint: tcp://docker:2375 - exposedByDefault: false - network: traefik - defaultRule: Host(`{{ index .Labels "com.docker.compose.service" }}.dev.dedicated.contact`) - file: - directory: /etc/traefik/dynamic/ - -serverstransport: - insecureskipverify: true - -api: - insecure: true - -accessLog: {} - -entryPoints: - web: - address: :80 - http: -# redirections: -# entryPoint: -# to: websecure -# scheme: https - websecure: - address: :443 - http: - tls: {} - -global: - sendAnonymousUsage: false +http: + routers: + traefik: + rule: Host(`traefik.dev.dedicated.contact`) + service: api@internal