From 95f0afbbeea20a46f98264baab9f726bb09295f7 Mon Sep 17 00:00:00 2001 From: mr-forust Date: Wed, 21 Jan 2026 20:14:02 +0100 Subject: [PATCH] feat: add traefik integration for error-handler TODO: fix css --- {errorpage => errorpages}/Dockerfile | 0 {errorpage => errorpages}/compose.yaml | 6 +++--- {errorpage => errorpages}/html/403.html | 2 +- {errorpage => errorpages}/html/404.html | 2 +- {errorpage => errorpages}/html/500.html | 2 +- {errorpage => errorpages}/html/502.html | 2 +- {errorpage => errorpages}/html/503.html | 2 +- {errorpage => errorpages}/html/504.html | 2 +- .../html/assets/css => errorpages/html}/style.css | 0 traefik/compose.yaml | 12 ++++++------ 10 files changed, 15 insertions(+), 15 deletions(-) rename {errorpage => errorpages}/Dockerfile (100%) rename {errorpage => errorpages}/compose.yaml (89%) rename {errorpage => errorpages}/html/403.html (95%) rename {errorpage => errorpages}/html/404.html (95%) rename {errorpage => errorpages}/html/500.html (95%) rename {errorpage => errorpages}/html/502.html (95%) rename {errorpage => errorpages}/html/503.html (95%) rename {errorpage => errorpages}/html/504.html (95%) rename {errorpage/html/assets/css => errorpages/html}/style.css (100%) diff --git a/errorpage/Dockerfile b/errorpages/Dockerfile similarity index 100% rename from errorpage/Dockerfile rename to errorpages/Dockerfile diff --git a/errorpage/compose.yaml b/errorpages/compose.yaml similarity index 89% rename from errorpage/compose.yaml rename to errorpages/compose.yaml index c0c0783..bac9dc2 100644 --- a/errorpage/compose.yaml +++ b/errorpages/compose.yaml @@ -1,9 +1,9 @@ services: errorpage: build: . - container_name: error-page - # ports: - # - 80 + container_name: error-pages + ports: + - 1234:80 networks: - proxy labels: diff --git a/errorpage/html/403.html b/errorpages/html/403.html similarity index 95% rename from errorpage/html/403.html rename to errorpages/html/403.html index a9db107..2d730da 100644 --- a/errorpage/html/403.html +++ b/errorpages/html/403.html @@ -7,7 +7,7 @@ 403 // Forbidden - + diff --git a/errorpage/html/404.html b/errorpages/html/404.html similarity index 95% rename from errorpage/html/404.html rename to errorpages/html/404.html index e766bae..8681609 100644 --- a/errorpage/html/404.html +++ b/errorpages/html/404.html @@ -7,7 +7,7 @@ 404 // Not Found - + diff --git a/errorpage/html/500.html b/errorpages/html/500.html similarity index 95% rename from errorpage/html/500.html rename to errorpages/html/500.html index 8d66073..c596689 100644 --- a/errorpage/html/500.html +++ b/errorpages/html/500.html @@ -7,7 +7,7 @@ 500 // Server Error - + diff --git a/errorpage/html/502.html b/errorpages/html/502.html similarity index 95% rename from errorpage/html/502.html rename to errorpages/html/502.html index 9df57c1..58802cb 100644 --- a/errorpage/html/502.html +++ b/errorpages/html/502.html @@ -7,7 +7,7 @@ 502 // Bad Gateway - + diff --git a/errorpage/html/503.html b/errorpages/html/503.html similarity index 95% rename from errorpage/html/503.html rename to errorpages/html/503.html index 7d618ab..aa4735a 100644 --- a/errorpage/html/503.html +++ b/errorpages/html/503.html @@ -7,7 +7,7 @@ 503 // Service Unavailable - + diff --git a/errorpage/html/504.html b/errorpages/html/504.html similarity index 95% rename from errorpage/html/504.html rename to errorpages/html/504.html index e24a8a4..0916b8e 100644 --- a/errorpage/html/504.html +++ b/errorpages/html/504.html @@ -7,7 +7,7 @@ 504 // Gateway Timeout - + diff --git a/errorpage/html/assets/css/style.css b/errorpages/html/style.css similarity index 100% rename from errorpage/html/assets/css/style.css rename to errorpages/html/style.css diff --git a/traefik/compose.yaml b/traefik/compose.yaml index 5cf8e38..bf740e0 100644 --- a/traefik/compose.yaml +++ b/traefik/compose.yaml @@ -17,10 +17,11 @@ services: # EntryPoints - "--entryPoints.web.address=:80" - - "--entryPoints.websecure.address=:443" - - "--entryPoints.websecure.http.tls=true" - - "--entryPoints.web.http.redirections.entryPoint.to=websecure" + # - "--entryPoints.web.http.middlewares=error-pages@docker" - "--entryPoints.web.http.redirections.entryPoint.scheme=https" + - "--entryPoints.websecure.address=:443" + - "--entryPoints.websecure.http.middlewares=error-pages@docker" + - "--entryPoints.websecure.http.tls=true" - "--entryPoints.ssh.address=:2221" # Let's Encrypt @@ -34,7 +35,6 @@ services: # Cloudflare - "--entryPoints.web.forwardedHeaders.trustedIPs=173.245.48.0/20,103.21.244.0/22,103.22.200.0/22,103.31.4.0/22,141.101.64.0/18,108.162.192.0/18,190.93.240.0/20,188.114.96.0/20,197.234.240.0/22,198.41.128.0/17,162.158.0.0/15,104.16.0.0/13,104.24.0.0/14,172.64.0.0/13,131.0.72.0/22" - "--entryPoints.websecure.forwardedHeaders.trustedIPs=173.245.48.0/20,103.21.244.0/22,103.22.200.0/22,103.31.4.0/22,141.101.64.0/18,108.162.192.0/18,190.93.240.0/20,188.114.96.0/20,197.234.240.0/22,198.41.128.0/17,162.158.0.0/15,104.16.0.0/13,104.24.0.0/14,172.64.0.0/13,131.0.72.0/22" - # # Logging # - "--log.level=INFO" # - "--log.filePath=/var/log/traefik/traefik.log" @@ -59,7 +59,7 @@ services: # Dev Router - "traefik.http.routers.traefik-dashboard-dev.rule=Host(`traefik.gigaforust.internal`)" - "traefik.http.routers.traefik-dashboard-dev.entrypoints=websecure" - - "traefik.http.routers.traefik-dashboard-dev.middlewares=security-chain@file" + - "traefik.http.routers.traefik-dashboard-dev.middlewares=security-headers@file" - "traefik.http.routers.traefik-dashboard-dev.service=api@internal" - "traefik.http.routers.traefik-dashboard-dev.tls=true" @@ -80,4 +80,4 @@ services: - proxy networks: proxy: - external: true \ No newline at end of file + external: true