Compare commits

..

2 Commits

Author SHA1 Message Date
860f4333e1 Testing new config
All checks were successful
Remote Deployment Pipeline / Prepare Context (pull_request) Successful in 2s
Remote Deployment Pipeline / Deploy (Staging) (pull_request) Has been skipped
Remote Deployment Pipeline / Deploy (Dev/Preview) (pull_request) Successful in 46s
Remote Deployment Pipeline / Cleanup Preview (pull_request) Has been skipped
Remote Deployment Pipeline / Deploy (Production) (pull_request) Has been skipped
2025-12-19 19:53:51 +01:00
5d5d7e783a Setup env
All checks were successful
Remote Deployment Pipeline / Prepare Context (pull_request) Successful in 3s
Remote Deployment Pipeline / Deploy (Staging) (pull_request) Has been skipped
Remote Deployment Pipeline / Deploy (Dev/Preview) (pull_request) Successful in 48s
Remote Deployment Pipeline / Deploy (Production) (pull_request) Has been skipped
Remote Deployment Pipeline / Cleanup Preview (pull_request) Has been skipped
2025-12-19 19:36:05 +01:00
8 changed files with 20 additions and 89 deletions

View File

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

View File

@@ -1,5 +1,10 @@
# ./traefik/forward-to-legacy-nginx.yaml
entryPoints:
web:
# Essential: Allows your routers to intercept /.well-known/acme-challenge/
allowACMEByPass: true
tcp:
routers:
# Router for HTTPS (Passthrough)
@@ -9,7 +14,7 @@ tcp:
# Passthrough must be true for SSL to reach Nginx encrypted
tls:
passthrough: true
priority: 10
priority: 1
entryPoints:
- "https"
@@ -23,7 +28,8 @@ tcp:
http:
routers:
# 1. TRAEFIK-MANAGED ACME HANDLER (Removed manual router)
# 1. ROUTE FOR TRAEFIK-MANAGED DOMAINS
# For domains Traefik should handle, send challenges to the internal ACME service.
traefik-acme-handler:
rule: "Host(`test-whoami.kovagoadi.hu`) && PathPrefix(`/.well-known/acme-challenge/`)"
entryPoints:
@@ -31,14 +37,15 @@ http:
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)
# 2. THE CATCH-ALL ROUTER (LEGACY)
# This remains your broad catch-all. Since it has lower priority,
# the one above handles the Traefik domains, and everything else hits this.
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"
priority: 1 # Will catch ACME for any domain NOT listed in the handler above
services:
nginx-legacy-service:

View File

@@ -1,30 +0,0 @@
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"

View File

@@ -1,6 +1,6 @@
services:
traefik:
image: "traefik:v3.6@sha256:67622638cd88dbfcfba40159bc652ecf0aea0e032f8a3c7e3134ae7c037b9910"
image: "traefik:v3.6@sha256:2979bff651c98e70345dd886186a7a15ee3ce18b636af208d4ccbf2d56dbdddd"
restart: unless-stopped
security_opt:
- no-new-privileges:true
@@ -8,14 +8,12 @@ services:
- 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"
@@ -30,7 +28,7 @@ services:
volumes:
- "/var/run/docker.sock:/var/run/docker.sock:ro"
- "letsencrypt:/letsencrypt"
- "./${ENV}:/etc/traefik"
- "./${ENV}/forward-to-legacy-nginx.yaml:/etc/traefik/forward-to-legacy-nginx.yaml"
whoami:
image: "traefik/whoami@sha256:200689790a0a0ea48ca45992e0450bc26ccab5307375b41c84dfc4f2475937ab"
@@ -40,9 +38,7 @@ 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

View File

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

View File

@@ -9,7 +9,7 @@ tcp:
# Passthrough must be true for SSL to reach Nginx encrypted
tls:
passthrough: true
priority: 10
priority: 1
entryPoints:
- "https"
@@ -23,20 +23,12 @@ tcp:
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)
# Router for HTTP
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
# Low priority ensures specific containers are handled first
priority: 1
entryPoints:
- "web"

View File

@@ -1,30 +0,0 @@
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"

View File

@@ -4,5 +4,4 @@ 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=