Compare commits

..

2 Commits

Author SHA1 Message Date
3wc
70d10587bc chore: publish 2.6.1+v2.11.0 release 2024-04-06 14:36:21 -03:00
3wc
bdf84fcefd Reinstate missing HTTP->HTTPS redirect 2024-04-06 14:35:53 -03:00
5 changed files with 8 additions and 53 deletions

View File

@ -1,3 +1,3 @@
export TRAEFIK_YML_VERSION=v20 export TRAEFIK_YML_VERSION=v19
export FILE_PROVIDER_YML_VERSION=v10 export FILE_PROVIDER_YML_VERSION=v9
export ENTRYPOINT_VERSION=v2 export ENTRYPOINT_VERSION=v2

View File

@ -1,29 +0,0 @@
---
version: "3.8"
services:
app:
environment:
- "CUSTOM_ERRORS=1"
volumes:
- "traefik-plugins:/plugins-local/"
errors:
image: "tarampampam/error-pages:2.27.0"
networks:
- proxy
deploy:
labels:
- "traefik.enable=true"
# use as "fallback" for any non-registered services (with priority below normal)
- "traefik.http.routers.${STACK_NAME}-error.rule=HostRegexp(`{host:.+}`)"
- "traefik.http.routers.${STACK_NAME}-error.priority=10"
- "traefik.http.routers.${STACK_NAME}-error.entrypoints=web-secure"
- "traefik.http.routers.${STACK_NAME}-error.tls.certresolver=${LETS_ENCRYPT_ENV}"
- "traefik.http.services.${STACK_NAME}-error.loadbalancer.server.port=8080"
# "errors" middleware settings
- "traefik.http.middlewares.${STACK_NAME}-error.errors.status=400-599"
- "traefik.http.middlewares.${STACK_NAME}-error.errors.service=${STACK_NAME}-error"
- "traefik.http.middlewares.${STACK_NAME}-error.errors.query=/{status}.html"
volumes:
traefik-plugins:

View File

@ -47,7 +47,7 @@ services:
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
- "traefik.http.routers.${STACK_NAME}.service=api@internal" - "traefik.http.routers.${STACK_NAME}.service=api@internal"
- "traefik.http.routers.${STACK_NAME}.middlewares=security@file" - "traefik.http.routers.${STACK_NAME}.middlewares=security@file"
- "coop-cloud.${STACK_NAME}.version=2.6.0+v2.11.0" - "coop-cloud.${STACK_NAME}.version=2.6.1+v2.11.0"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
networks: networks:

View File

@ -1,19 +1,6 @@
--- ---
http: http:
middlewares: middlewares:
{{ if eq (env "CUSTOM_ERRORS") "1" }}
error:
plugin:
traefik-error-page:
debug: "true"
contentsOnly: "false"
contentsOnlyMatch: "Bad Gateway"
query: /{status}.html
service: http://{{ env "STACK_NAME" }}_errors:8080
status:
- 502
{{ end }}
{{ if eq (env "KEYCLOAK_MIDDLEWARE_ENABLED") "1" }} {{ if eq (env "KEYCLOAK_MIDDLEWARE_ENABLED") "1" }}
keycloak: keycloak:
forwardAuth: forwardAuth:

View File

@ -24,6 +24,10 @@ api:
entrypoints: entrypoints:
web: web:
address: ":80" address: ":80"
http:
redirections:
entryPoint:
to: web-secure
web-secure: web-secure:
address: ":443" address: ":443"
{{ if eq (env "GITEA_SSH_ENABLED") "1" }} {{ if eq (env "GITEA_SSH_ENABLED") "1" }}
@ -115,10 +119,3 @@ certificatesResolvers:
- "1.1.1.1:53" - "1.1.1.1:53"
- "9.9.9.9:53" - "9.9.9.9:53"
{{ end }} {{ end }}
{{ if eq (env "CUSTOM_ERRORS") "1" }}
experimental:
localplugins:
traefik-error-page:
moduleName: "github.com/3-w-c/traefik-error-page"
{{ end }}