diff --git a/ansible/roles/traefik/handlers/main.yml b/ansible/roles/traefik/handlers/main.yml index 58be017..c1a062e 100644 --- a/ansible/roles/traefik/handlers/main.yml +++ b/ansible/roles/traefik/handlers/main.yml @@ -1,4 +1,4 @@ - name: restart traefik community.docker.docker_compose_v2: project_src: "{{ install_directory }}/traefik" - restarted: true + state: restarted diff --git a/ansible/roles/traefik/templates/conf/file-provider-adguard.yml b/ansible/roles/traefik/templates/conf/file-provider-adguard.yml deleted file mode 100644 index 86b9e0e..0000000 --- a/ansible/roles/traefik/templates/conf/file-provider-adguard.yml +++ /dev/null @@ -1,13 +0,0 @@ -http: - routers: - router-adguard: - rule: "Host(`adguard.local.{{ personal_domain }}`)" - service: service-adguard - middlewares: - - lan-whitelist@file - - services: - service-adguard: - loadBalancer: - servers: - - url: http://10.0.0.1:81 diff --git a/ansible/roles/traefik/templates/conf/file-provider-ezbeq.yml b/ansible/roles/traefik/templates/conf/file-provider-ezbeq.yml deleted file mode 100644 index 6401a37..0000000 --- a/ansible/roles/traefik/templates/conf/file-provider-ezbeq.yml +++ /dev/null @@ -1,13 +0,0 @@ -http: - routers: - router-ezbeq: - rule: "Host(`ezbeq.local.{{ personal_domain }}`)" - service: service-ezbeq - middlewares: - - lan-whitelist@file - - services: - service-ezbeq: - loadBalancer: - servers: - - url: http://10.0.0.84:8080 diff --git a/ansible/roles/traefik/templates/conf/file-provider-homeassistant.yml b/ansible/roles/traefik/templates/conf/file-provider-homeassistant.yml index a5075d2..d354309 100644 --- a/ansible/roles/traefik/templates/conf/file-provider-homeassistant.yml +++ b/ansible/roles/traefik/templates/conf/file-provider-homeassistant.yml @@ -8,4 +8,4 @@ http: service-homeassistant: loadBalancer: servers: - - url: http://10.0.0.27:8123 + - url: http://haos:8123 diff --git a/ansible/roles/traefik/templates/conf/file-provider-jellyfin.yml b/ansible/roles/traefik/templates/conf/file-provider-jellyfin.yml index 04b3865..cb0777a 100644 --- a/ansible/roles/traefik/templates/conf/file-provider-jellyfin.yml +++ b/ansible/roles/traefik/templates/conf/file-provider-jellyfin.yml @@ -8,4 +8,4 @@ http: service-jellyfin: loadBalancer: servers: - - url: http://10.0.0.30:8096 + - url: http://jellyfin:8096 diff --git a/ansible/roles/traefik/templates/conf/file-provider-pbs.yml b/ansible/roles/traefik/templates/conf/file-provider-pbs.yml new file mode 100644 index 0000000..deecc19 --- /dev/null +++ b/ansible/roles/traefik/templates/conf/file-provider-pbs.yml @@ -0,0 +1,13 @@ +http: + routers: + router-pbs: + rule: "Host(`pbs.local.{{ personal_domain }}`)" + service: service-pbs + middlewares: + - lan-whitelist@file + + services: + service-pbs: + loadBalancer: + servers: + - url: https://10.0.0.28:8007 diff --git a/ansible/roles/traefik/templates/conf/file-provider-plex.yml b/ansible/roles/traefik/templates/conf/file-provider-plex.yml index d961908..4b9203a 100644 --- a/ansible/roles/traefik/templates/conf/file-provider-plex.yml +++ b/ansible/roles/traefik/templates/conf/file-provider-plex.yml @@ -8,4 +8,4 @@ http: service-plex: loadBalancer: servers: - - url: https://10.0.0.31:32400 + - url: https://plex:32400 diff --git a/ansible/roles/traefik/templates/conf/file-provider-proxmox.yml b/ansible/roles/traefik/templates/conf/file-provider-proxmox.yml index 5d9803b..abe0963 100644 --- a/ansible/roles/traefik/templates/conf/file-provider-proxmox.yml +++ b/ansible/roles/traefik/templates/conf/file-provider-proxmox.yml @@ -10,4 +10,4 @@ http: service-proxmox: loadBalancer: servers: - - url: https://10.0.0.2:8006 + - url: https://pve:8006 diff --git a/ansible/roles/traefik/templates/conf/file-provider-sws.yml b/ansible/roles/traefik/templates/conf/file-provider-sws.yml new file mode 100644 index 0000000..b1492a6 --- /dev/null +++ b/ansible/roles/traefik/templates/conf/file-provider-sws.yml @@ -0,0 +1,11 @@ +http: + routers: + router-sws: + rule: "Host(`mjwilson.org`)" + service: service-sws + + services: + service-sws: + loadBalancer: + servers: + - url: http://arch-web:80 diff --git a/ansible/roles/traefik/templates/conf/middlewares.yml b/ansible/roles/traefik/templates/conf/middlewares.yml index 6aec19f..0ffa44e 100644 --- a/ansible/roles/traefik/templates/conf/middlewares.yml +++ b/ansible/roles/traefik/templates/conf/middlewares.yml @@ -4,8 +4,10 @@ http: ipWhitelist: sourceRange: - 10.0.0.0/24 - - 10.67.115.0/24 + - 10.0.2.0/24 + - 10.10.10.0/24 - 172.16.0.0/12 + - 172.18.0.0/12 secure-headers: headers: @@ -15,4 +17,4 @@ http: stsPreload: true customResponseHeaders: Permissions-Policy: interest-cohort() # Opts out of Google's FLoC network. See https://paramdeo.com/blog/opting-your-website-out-of-googles-floc-network - X-Robots-Tag: none + X-Robots-Tag: noindex,nofollow diff --git a/ansible/roles/traefik/templates/docker-compose.yml b/ansible/roles/traefik/templates/docker-compose.yml index d1fa75b..a5b0296 100644 --- a/ansible/roles/traefik/templates/docker-compose.yml +++ b/ansible/roles/traefik/templates/docker-compose.yml @@ -1,4 +1,3 @@ - networks: traefik: external: true @@ -8,7 +7,7 @@ networks: services: traefik: container_name: traefik - image: traefik:v2.9 + image: traefik:v3.1 depends_on: docker_socket_proxy: condition: service_healthy