From 0ad5605369f1d89e1bd4578d21ddb86b108ab815 Mon Sep 17 00:00:00 2001
From: Simon Einzinger <info@simon-einzinger.de>
Date: Mon, 23 Dec 2024 21:22:55 +0100
Subject: [PATCH] Changed TLS challenge settings

---
 docker-compose.yml |  5 ++--
 traefik.yaml       | 58 +++++++++++++++++++++++++---------------------
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index acf7ca0..4f9e461 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,7 +15,8 @@ services:
 
   traefik:
     depends_on:
-      - dockerproxy
+      dockerproxy:
+        condition: service_started
     image: traefik:v3.2
     container_name: traefik
     networks:
@@ -27,5 +28,5 @@ services:
     restart: always
     volumes:
       - ./traefik.yaml:/etc/traefik/traefik.yaml:ro
-      - ./letsencrypt:/var/letsencrypt
+      - ./letsencrypt:/letsencrypt
       - ./log:/log
diff --git a/traefik.yaml b/traefik.yaml
index 2b1174c..d520034 100644
--- a/traefik.yaml
+++ b/traefik.yaml
@@ -24,6 +24,11 @@ global:
 entryPoints:
   web:
     address: ":80"
+    http:
+      redirections:
+        entryPoint:
+          to: websecure
+          scheme: https
 
   websecure:
     address: ":443"
@@ -32,7 +37,7 @@ certificatesResolvers:
   resolver:
     acme:
       email: info@simon-einzinger.de
-      storage: /var/letsencrypt/acme.json
+      storage: "/letsencrypt/acme.json"
       httpChallenge:
         entryPoint: web
 
@@ -72,8 +77,6 @@ log:
 
   maxAge: 14
 
-
-
 ################################################################
 # Access logs configuration
 ################################################################
@@ -85,19 +88,19 @@ log:
 # Optional
 #
 #accessLog:
-  # Sets the file path for the access log. If not specified, stdout will be used.
-  # Intermediate directories are created if necessary.
-  #
-  # Optional
-  # Default: os.Stdout
-  #
+# Sets the file path for the access log. If not specified, stdout will be used.
+# Intermediate directories are created if necessary.
+#
+# Optional
+# Default: os.Stdout
+#
 #  filePath: /path/to/log/log.txt
 
-  # Format is either "json" or "common".
-  #
-  # Optional
-  # Default: "common"
-  #
+# Format is either "json" or "common".
+#
+# Optional
+# Default: "common"
+#
 #  format: json
 
 ################################################################
@@ -108,7 +111,8 @@ log:
 #
 # Optional
 #
-api: {}
+api:
+  {}
   # Enable the API in insecure mode
   #
   # Optional
@@ -116,12 +120,12 @@ api: {}
   #
 #  insecure: true
 
-  # Enabled Dashboard
-  #
-  # Optional
-  # Default: true
-  #
-  #  dashboard: true
+# Enabled Dashboard
+#
+# Optional
+# Default: true
+#
+#  dashboard: true
 
 ################################################################
 # Ping configuration
@@ -129,11 +133,11 @@ api: {}
 
 # Enable ping
 #ping:
-  # Name of the related entry point
-  #
-  # Optional
-  # Default: "traefik"
-  #
+# Name of the related entry point
+#
+# Optional
+# Default: "traefik"
+#
 #  entryPoint: traefik
 
 ################################################################
@@ -155,7 +159,7 @@ providers:
     # Optional
     # Default: "Host(`{{ normalize .Name }}`)"
     #
-#    defaultRule: Host(`{{ normalize .Name }}.docker.localhost`)
+    #    defaultRule: Host(`{{ normalize .Name }}.docker.localhost`)
 
     # Expose containers by default in traefik
     #