Traefik cleanup and switch to yaml

server/config/traefik/config/traefik_api.yaml

@@ -3,6 +3,7 @@ http:
     api:
       rule: "Host(`traefik.jafner.net`)"
       entryPoints: "websecure"
+      middlewares: authentik@file
       service: "api@internal"
       tls:
         certResolver: "lets-encrypt"

server/config/traefik/docker-compose.yml

@@ -13,12 +13,9 @@ services:
       - 28080:8080
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock:ro
-      - ./traefik.toml:/traefik.toml
+      - ./traefik.yaml:/traefik.yaml
       - ./config:/config
       - $DOCKER_DATA/acme.json:/acme.json
-      - ./.htpasswd:/.htpasswd
-    labels:
-      - traefik.http.routers.traefik.middlewares=authentik@file
 
 networks:
   web:

server/config/traefik/traefik.toml

@@ -1,27 +0,0 @@
-[entryPoints]
-  [entryPoints.web]
-    address = ":80"
-    [entryPoints.web.http.redirections.entryPoint]
-      to = "websecure"
-      scheme = "https"
-  [entryPoints.websecure]
-    address = ":443"
-
-[metrics]
-  [metrics.prometheus]
-
-[certificatesResolvers.lets-encrypt.acme]
-  email = "jafner425@gmail.com"
-  storage = "acme.json"
-  [certificatesResolvers.lets-encrypt.acme.tlsChallenge]
-
-[api]
-  insecure = true
-  dashboard = true
-
-[providers.docker]
-  watch = true
-  network = "web"
-
-[providers.file]
-  directory = "/config"

server/config/traefik/traefik.yaml

@@ -0,0 +1,30 @@
+entryPoints:
+  web:
+    address: :80
+    redirections:
+      entryPoint:
+        to: websecure
+        scheme: https
+  websecure:
+    address: :443
+
+metrics:
+  prometheus: {}
+
+certificatesResolvers:
+  lets-encrypt:
+    acme:
+      email: jafner425@gmail.com
+      storage: acme.json
+      tlsChallenge: {}
+
+api: 
+  insecure: true
+  dashboard: true
+
+providers:
+  docker:
+    watch: true
+    network: web
+  file:
+    directory: /config