From 8398a2df21df93463d140c209b3347a6e51ce4bc Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Sat, 27 Mar 2021 23:34:34 +0000
Subject: [PATCH] Use endpoint middleware rather than hacky router

---
 ansible/roles/traefik/files/file-provider-main.yml | 9 ---------
 ansible/roles/traefik/files/traefik.yml            | 9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ansible/roles/traefik/files/file-provider-main.yml b/ansible/roles/traefik/files/file-provider-main.yml
index d29f6ad..938102e 100644
--- a/ansible/roles/traefik/files/file-provider-main.yml
+++ b/ansible/roles/traefik/files/file-provider-main.yml
@@ -5,12 +5,3 @@ http:
         scheme: https
     compress:
       compress: {}
-
-  routers:
-    tls-redirect:
-      service: ping@internal
-      rule: PathPrefix(`/`)
-      entryPoints:
-        - web
-      middlewares:
-        - tls-redirect
diff --git a/ansible/roles/traefik/files/traefik.yml b/ansible/roles/traefik/files/traefik.yml
index 72cf874..1b5e824 100644
--- a/ansible/roles/traefik/files/traefik.yml
+++ b/ansible/roles/traefik/files/traefik.yml
@@ -1,6 +1,9 @@
 entryPoints:
   web:
     address: :80
+    http:
+      middlewares:
+        - tls-redirect@file
     proxyProtocol:
       trustedIPs:
         - "{{ wireguard.cidr }}"
@@ -8,6 +11,9 @@ entryPoints:
         - "{{ nebula.cidr }}"
   web-secure:
     address: :443
+    http:
+      middlewares:
+        - tls-redirect@file
     proxyProtocol:
       trustedIPs:
         - "{{ wireguard.cidr }}"
@@ -15,6 +21,9 @@ entryPoints:
         - "{{ nebula.cidr }}"
   matrix:
     address: :8448
+    http:
+      middlewares:
+        - tls-redirect@file
     proxyProtocol:
       trustedIPs:
         - "{{ wireguard.cidr }}"