From 2487a53ebf4c2942c74f0de3e9b26ccbfd2cf616 Mon Sep 17 00:00:00 2001
From: kovagoadi <kovagoadi@gmail.com>
Date: Sat, 20 Dec 2025 15:10:50 +0100
Subject: [PATCH] Pre-merge changes

---
 dev/forward-to-legacy-nginx.yaml  | 47 -------------------------------
 docker-compose.yaml               |  6 +---
 prod/forward-to-legacy-nginx.yaml |  2 +-
 3 files changed, 2 insertions(+), 53 deletions(-)
 delete mode 100644 dev/forward-to-legacy-nginx.yaml

diff --git a/dev/forward-to-legacy-nginx.yaml b/dev/forward-to-legacy-nginx.yaml
deleted file mode 100644
index 49e50d2..0000000
--- a/dev/forward-to-legacy-nginx.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-# ./traefik/forward-to-legacy-nginx.yaml
-
-tcp:
-  routers:
-    # Router for HTTPS (Passthrough)
-    nginx-legacy-router-secure:
-      rule: "HostSNI(`*`)"
-      service: nginx-legacy-service-secure
-      # Passthrough must be true for SSL to reach Nginx encrypted
-      tls:
-        passthrough: true
-      priority: 10
-      entryPoints:
-        - "https"
-
-  services:
-    # Service defining the external IP
-    nginx-legacy-service-secure:
-      loadBalancer:
-        servers:
-          # This is the actual external IP and Port of your Nginx
-          - address: "webserver:443"
-
-http:
-  routers:
-    # 1. TRAEFIK-MANAGED ACME HANDLER (Removed manual router)
-    traefik-acme-handler:
-      rule: "Host(`test-whoami.dev.kovagoadi.hu`) && PathPrefix(`/.well-known/acme-challenge/`)"
-      entryPoints:
-        - "web"
-      service: "acme-http@internal" # This is the internal service name
-      priority: 1000                # High priority to ensure it wins
-
-    # 2. THE HTTP CATCH-ALL (Sends other ACME and HTTP to Nginx)
-    nginx-legacy-router:
-      rule: "HostRegexp(`^.+$`)"
-      service: nginx-legacy-service
-      # Low priority ensures specific containers are handled first, but before the default acme-handler
-      priority: 90
-      entryPoints:
-        - "web"
-
-  services:
-    nginx-legacy-service:
-      loadBalancer:
-        servers:
-          - url: "http://webserver:80"
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index ec9dd02..d0ab6a3 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,12 +1,11 @@
 services:
-  traefik11:
+  traefik:
     image: "traefik:v3.6@sha256:67622638cd88dbfcfba40159bc652ecf0aea0e032f8a3c7e3134ae7c037b9910"
     restart: unless-stopped
     security_opt:
       - no-new-privileges:true
     networks:
       - proxy
-      # - legacy-nginx
     command:
       - "--providers.docker=true"
       - "--providers.docker.exposedbydefault=false"
@@ -49,8 +48,5 @@ services:
       - traefik.http.routers.https.tls.certresolver=letsencrypt
 networks:
   proxy:
-  # legacy-nginx:
-  #   name: proxy
-  #   external: true
 volumes:
   letsencrypt:
\ No newline at end of file
diff --git a/prod/forward-to-legacy-nginx.yaml b/prod/forward-to-legacy-nginx.yaml
index 49e50d2..4da1e72 100644
--- a/prod/forward-to-legacy-nginx.yaml
+++ b/prod/forward-to-legacy-nginx.yaml
@@ -25,7 +25,7 @@ http:
   routers:
     # 1. TRAEFIK-MANAGED ACME HANDLER (Removed manual router)
     traefik-acme-handler:
-      rule: "Host(`test-whoami.dev.kovagoadi.hu`) && PathPrefix(`/.well-known/acme-challenge/`)"
+      rule: "Host(`test-whoami.kovagoadi.hu`) && PathPrefix(`/.well-known/acme-challenge/`)"
       entryPoints:
         - "web"
       service: "acme-http@internal" # This is the internal service name