diff --git a/ansible/roles/docker/files/traefik/docker-compose.yml b/ansible/roles/docker/files/traefik/docker-compose.yml index 0d65564..a0c3d5a 100644 --- a/ansible/roles/docker/files/traefik/docker-compose.yml +++ b/ansible/roles/docker/files/traefik/docker-compose.yml @@ -3,7 +3,7 @@ version: "2.3" services: traefik: container_name: traefik - image: traefik:v2.1.6 + image: traefik:v2.2.0 # command: "--log.level=DEBUG" network_mode: host volumes: diff --git a/ansible/roles/docker/files/traefik/file-provider.yml b/ansible/roles/docker/files/traefik/file-provider.yml index b4d7767..ce8e0a2 100644 --- a/ansible/roles/docker/files/traefik/file-provider.yml +++ b/ansible/roles/docker/files/traefik/file-provider.yml @@ -6,9 +6,6 @@ http: - "10.0.0.0/8" - "172.16.0.0/12" - "192.168.0.0/16" - hsts: - redirectScheme: - scheme: https routers: hsts: @@ -16,20 +13,15 @@ http: rule: PathPrefix(`/`) entryPoints: - web - middlewares: - - hsts ping: service: ping@internal rule: Host(`traefik.jakehoward.tech`) && Path(`/ping/`) - middlewares: - - hsts tls: certResolver: le dashboard: service: dashboard@internal rule: Host(`traefik.jakehoward.tech`) middlewares: - - hsts - internal-only tls: certResolver: le @@ -37,7 +29,6 @@ http: service: api@internal rule: Host(`traefik.jakehoward.tech`) && PathPrefix(`/api`) middlewares: - - hsts - internal-only tls: certResolver: le diff --git a/ansible/roles/docker/files/traefik/traefik.yml b/ansible/roles/docker/files/traefik/traefik.yml index 9f2b718..f65ad04 100644 --- a/ansible/roles/docker/files/traefik/traefik.yml +++ b/ansible/roles/docker/files/traefik/traefik.yml @@ -1,6 +1,11 @@ entryPoints: web: address: ":80" + http: + redirections: + entryPoint: + to: web-secure + scheme: https proxyProtocol: trustedIPs: - "{{ wireguard.cidr }}"