Add new Regexp

Reviewed-on: #24
Co-authored-by: kovagoadi <kovagoadi@gmail.com>
Co-committed-by: kovagoadi <kovagoadi@gmail.com>

dev.env

@@ -4,4 +4,6 @@ ENV=dev
 NETWORK_NAME=proxy
 CERTBOT_CA_RESOLVER=https://acme-staging-v02.api.letsencrypt.org/directory
 DOMAIN=dev.kovagoadi.hu
-TRAEFIK_LEGACY_OPT=
+ACME_BYPASS=false
+# TRAEFIK_LEGACY_OPT=
+TRAEFIK_LEGACY_OPT="--providers.file.directory=/etc/traefik"

dev/forward-to-legacy-nginx.yaml

@@ -0,0 +1,47 @@
+# ./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.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"

dev/route-to-staging-dev.yaml

@@ -0,0 +1,30 @@
+http:
+  routers:
+    # Router for HTTP (Port 80)
+    staging:
+      rule: "Host(`staging.kovagoadi.hu`) || Host(`test-whoami.staging.kovagoadi.hu`)"
+      entryPoints:
+        - "web"
+      service: "dev-staging"
+      priority: 1000000
+
+    # Router for HTTPS (Port 443)
+    staging-secure:
+      rule: "Host(`staging.kovagoadi.hu`) || Host(`dev.kovagoadi.hu`)"
+      entryPoints:
+        - "https"
+      service: "dev-staging-secure"
+      priority: 100
+      tls: {} # <--- This enables TLS for this router
+
+  services:
+    dev-staging:
+      loadBalancer:
+        servers:
+          - url: "http://192.168.1.85:8080"
+          
+    dev-staging-secure:
+      loadBalancer:
+        servers:
+          # Note: Ensure Traefik trusts the cert at .85 or set insecureSkipVerify
+          - url: "https://192.168.1.85:445"

docker-compose.yaml

@@ -1,18 +1,21 @@
 services:
   traefik:
-    image: "traefik:v3.6@sha256:2979bff651c98e70345dd886186a7a15ee3ce18b636af208d4ccbf2d56dbdddd"
+    image: "traefik:v3.6@sha256:67622638cd88dbfcfba40159bc652ecf0aea0e032f8a3c7e3134ae7c037b9910"
     restart: unless-stopped
     security_opt:
       - no-new-privileges:true
     networks:
       - proxy
+      - legacy-nginx
     command:
+      - "--log.level=DEBUG"
       - "--providers.docker=true"
       - "--providers.docker.exposedbydefault=false"
       - "--providers.docker.network=proxy"
       - "--providers.docker.constraints=Label(`env`, `${ENV}`)"
       - "--entryPoints.web.address=:80"
       - "--entryPoints.https.address=:443"
+      - "--entryPoints.web.allowACMEByPass=${ACME_BYPASS}"
       - "--certificatesresolvers.letsencrypt.acme.httpchallenge=true"
       - "--certificatesresolvers.letsencrypt.acme.httpchallenge.entrypoint=web"
       - "--certificatesresolvers.letsencrypt.acme.email=kovagoadi@gmail.com"
@@ -27,7 +30,7 @@ services:
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
       - "letsencrypt:/letsencrypt"
-      - "./${ENV}/forward-to-legacy-nginx.yaml:/etc/traefik/forward-to-legacy-nginx.yaml"
+      - "./${ENV}:/etc/traefik"
 
   whoami:
     image: "traefik/whoami@sha256:200689790a0a0ea48ca45992e0450bc26ccab5307375b41c84dfc4f2475937ab"
@@ -37,7 +40,9 @@ services:
     labels:
       - "env=${ENV}"
       - "traefik.enable=true"
+      - "traefik.http.routers.whoami.priority=1000000"
       - "traefik.http.routers.whoami.rule=Host(`test-whoami.${DOMAIN}`)"
+      - "traefik.http.routers.https.priority=1000000"
       - "traefik.http.routers.https.rule=Host(`test-whoami.${DOMAIN}`)"
       - "traefik.http.routers.whoami.entrypoints=web"
       - traefik.http.routers.https.entrypoints=https
@@ -45,5 +50,8 @@ services:
       - traefik.http.routers.https.tls.certresolver=letsencrypt
 networks:
   proxy:
+  legacy-nginx:
+    name: proxy
+    external: true
 volumes:
   letsencrypt:

prod.env

@@ -4,4 +4,5 @@ ENV=prod
 NETWORK_NAME=proxy
 CERTBOT_CA_RESOLVER=https://acme-v02.api.letsencrypt.org/directory
 DOMAIN=kovagoadi.hu
-TRAEFIK_LEGACY_OPT="--providers.file.filename=/etc/traefik/forward-to-legacy-nginx.yaml"
+ACME_BYPASS=true
+TRAEFIK_LEGACY_OPT="--providers.file.directory=/etc/traefik"

prod/forward-to-legacy-nginx.yaml

@@ -9,7 +9,7 @@ tcp:
       # Passthrough must be true for SSL to reach Nginx encrypted
       tls:
         passthrough: true
-      priority: 1
+      priority: 10
       entryPoints:
         - "https"
 
@@ -23,12 +23,20 @@ tcp:
 
 http:
   routers:
-    # Router for HTTP
+    # 1. TRAEFIK-MANAGED ACME HANDLER (Removed manual router)
+    traefik-acme-handler:
+      rule: "Host(`test-whoami.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
-      priority: 1
+      # Low priority ensures specific containers are handled first, but before the default acme-handler
+      priority: 90
       entryPoints:
         - "web"
 

prod/route-to-staging-dev.yaml

@@ -0,0 +1,30 @@
+http:
+  routers:
+    # Router for HTTP (Port 80)
+    staging:
+      rule: "HostRegexp({subdomain:.+}.staging.kovagoadi.hu`) || Host(`staging.kovagoadi.hu`) || Host(`dev.kovagoadi.hu`)"
+      entryPoints:
+        - "web"
+      service: "dev-staging"
+      priority: 1_000_000
+
+    # Router for HTTPS (Port 443)
+    staging-secure:
+      rule: "Host(`staging.kovagoadi.hu`) || Host(`dev.kovagoadi.hu`)"
+      entryPoints:
+        - "https"
+      service: "dev-staging-secure"
+      priority: 100
+      tls: {} # <--- This enables TLS for this router
+
+  services:
+    dev-staging:
+      loadBalancer:
+        servers:
+          - url: "http://192.168.1.85:8080"
+          
+    dev-staging-secure:
+      loadBalancer:
+        servers:
+          # Note: Ensure Traefik trusts the cert at .85 or set insecureSkipVerify
+          - url: "https://192.168.1.85:445"

staging.env

@@ -4,4 +4,5 @@ ENV=staging
 NETWORK_NAME=proxy
 CERTBOT_CA_RESOLVER=https://acme-staging-v02.api.letsencrypt.org/directory
 DOMAIN=staging.kovagoadi.hu
+ACME_BYPASS=false
 TRAEFIK_LEGACY_OPT=