From ad40d77b640ef6dfeccbb9ea3ed6a26290ad8c57 Mon Sep 17 00:00:00 2001
From: josiah <me@jowj.net>
Date: Sun, 24 Oct 2021 19:34:35 -0500
Subject: [PATCH] Change from toml to yml.

---
 .../roles/mediaserver/templates/traefik.toml  | 36 --------------
 .../mediaserver/templates/traefik.yml.j2      | 49 +++++++++++++++++++
 2 files changed, 49 insertions(+), 36 deletions(-)
 delete mode 100644 ansible/roles/mediaserver/templates/traefik.toml
 create mode 100644 ansible/roles/mediaserver/templates/traefik.yml.j2

diff --git a/ansible/roles/mediaserver/templates/traefik.toml b/ansible/roles/mediaserver/templates/traefik.toml
deleted file mode 100644
index b0ce756..0000000
--- a/ansible/roles/mediaserver/templates/traefik.toml
+++ /dev/null
@@ -1,36 +0,0 @@
-# defaultEntryPoints must be at the top
-# because it should not be in any table below
-
-defaultEntryPoints = ["http", "https"]
-
-[log]
-  level = "DEBUG"
-
-[api]
-  dashboard = true
-
-[entryPoints]
-  [entryPoints.http]
-    address = ":80"
-  [entryPoints.https]
-    address = ":443"
-
-[http.middlewares]
-  [http.middlewares.mediaserver-https-redir.redirectScheme]
-    scheme = "https"
-    permanent = true
-
-[certificatesResolvers.mediaserver-resolver.acme]
-  storage = "/acme.json"
-  email = "admin@home.jowj.net"
-  [certificatesResolvers.mediaserver-resolver.acme.dnsChallenge]
-    provider = "digitalocean"
-    delayBeforeCheck = 0
-
-[providers.docker]
-
-[docker]
-  endpoint = "unix:///var/run/docker.sock"
-  domain = "hatchery.home.jowj.net"
-  watch = true
-  exposedbydefault = false
diff --git a/ansible/roles/mediaserver/templates/traefik.yml.j2 b/ansible/roles/mediaserver/templates/traefik.yml.j2
new file mode 100644
index 0000000..b365df5
--- /dev/null
+++ b/ansible/roles/mediaserver/templates/traefik.yml.j2
@@ -0,0 +1,49 @@
+---
+
+# defaultEntryPoints must be at the top
+defaultEntryPoints:
+  - http
+  - https
+
+log:
+  level: DEBUG
+  format: common
+accessLog:
+  format: common
+
+api:
+  dashboard: true
+
+entryPoints:
+  http:
+    address: ":80"
+  https:
+    address: ":443"
+
+http:
+  middlewares:
+    mediaserver-https-redir:
+      redirectScheme:
+        scheme: https
+        permanent: true
+
+certificatesResolvers:
+  mediaserver-resolver:
+    acme:
+      storage: /acme.json
+      email: "admin@home.jowj.net"
+      dnsChallenge:
+        provider: "digitalocean"
+
+providers:
+  docker: {}
+
+docker:
+  endpoint: unix:///var/run/docker.sock
+  domain: "services.jowj.net"
+  watch: true
+  exposedbydefault: false
+
+# smh https://github.com/traefik/traefik/issues/7360
+pilot:
+  dashboard: false