From b2d663e95cc7e49eae0d2097e588bd1b1693af6d Mon Sep 17 00:00:00 2001
From: VaalaCat <me@vaala.cat>
Date: Mon, 7 Apr 2025 12:46:11 +0000
Subject: [PATCH] fix: some upgrade

---
 conf/traefik.yaml   | 18 ++++++++++++++++++
 docker-compose.yaml |  8 ++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/conf/traefik.yaml b/conf/traefik.yaml
index 723665a..f917cea 100755
--- a/conf/traefik.yaml
+++ b/conf/traefik.yaml
@@ -10,6 +10,14 @@ entryPoints:
 
   websecure:
     address: ":443"
+    http:
+      redirections:
+        entryPoint:
+          to: websecure
+          scheme: https
+          permanent: true
+  metrics:
+    address: ":40882"
 
 api:
   insecure: true
@@ -39,3 +47,13 @@ certificatesResolvers:
       storage: acme.json
       dnsChallenge:
         provider: cloudflare
+
+metrics:
+  prometheus:
+    entryPoint: metrics
+    headerLabels:
+      x_real_ip: X-Real-Ip
+      x_forwarded_host: X-Forwarded-Host
+      x_forwarded_port: X-Forwarded-Port
+      x_forwarded_for: X-Forwarded-For
+      x_forwarded_proto: X-Forwarded-Proto
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index d59a4da..c7ec9c9 100755
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   reverse-proxy:
-    image: traefik:3.1
+    image: traefik:3.3
     restart: unless-stopped
     ports:
       - "30080:80"
@@ -42,7 +42,7 @@ services:
       - "traefik.http.middlewares.traefik-forward-auth.forwardauth.authResponseHeaders=X-Forwarded-User"
 
   whoami:
-    image: containous/whoami
+    image: traefik/whoami
     restart: unless-stopped
     expose:
       - 80
@@ -58,5 +58,5 @@ services:
 
 networks:
   traefik:
-    external:
-      name: traefik
+    external: true
+    name: traefik
\ No newline at end of file