Compare commits

..

1 Commits

Author SHA1 Message Date
51099c5ca0 Remove abbreviation 'pat' for consistency. 2024-10-03 12:30:23 -04:00
9 changed files with 20 additions and 20 deletions

View File

@ -16,9 +16,9 @@ steps:
STACK_NAME: traefik STACK_NAME: traefik
LETS_ENCRYPT_ENV: production LETS_ENCRYPT_ENV: production
LETS_ENCRYPT_EMAIL: helo@autonomic.zone LETS_ENCRYPT_EMAIL: helo@autonomic.zone
TRAEFIK_YML_VERSION: v21 TRAEFIK_YML_VERSION: v5
FILE_PROVIDER_YML_VERSION: v10 FILE_PROVIDER_YML_VERSION: v4
ENTRYPOINT_VERSION: v4 ENTRYPOINT_VERSION: v1
trigger: trigger:
branch: branch:
- master - master

View File

@ -1,7 +1,6 @@
TYPE=traefik TYPE=traefik
TIMEOUT=300 TIMEOUT=300
ENABLE_AUTO_UPDATE=true ENABLE_AUTO_UPDATE=true
ENABLE_BACKUPS=true
DOMAIN=traefik.example.com DOMAIN=traefik.example.com
LETS_ENCRYPT_ENV=production LETS_ENCRYPT_ENV=production
@ -10,7 +9,6 @@ LETS_ENCRYPT_EMAIL=certs@example.com
# DASHBOARD_ENABLED=true # DASHBOARD_ENABLED=true
# WARN, INFO etc. # WARN, INFO etc.
LOG_LEVEL=WARN LOG_LEVEL=WARN
LOG_MAX_AGE=0
# This is here so later lines can extend it; you likely don't wanna edit # This is here so later lines can extend it; you likely don't wanna edit
COMPOSE_FILE="compose.yml" COMPOSE_FILE="compose.yml"

View File

@ -1,3 +1,3 @@
export TRAEFIK_YML_VERSION=v22 export TRAEFIK_YML_VERSION=v21
export FILE_PROVIDER_YML_VERSION=v10 export FILE_PROVIDER_YML_VERSION=v10
export ENTRYPOINT_VERSION=v4 export ENTRYPOINT_VERSION=v3

View File

@ -3,13 +3,13 @@ version: "3.8"
services: services:
app: app:
environment: environment:
- GANDIV5_PERSONAL_ACCESS_TOKEN_FILE=/run/secrets/gandiv5_pat - GANDIV5_PERSONAL_ACCESS_TOKEN_FILE=/run/secrets/gandiv5_personal_access_token
- LETS_ENCRYPT_DNS_CHALLENGE_ENABLED - LETS_ENCRYPT_DNS_CHALLENGE_ENABLED
- LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER - LETS_ENCRYPT_DNS_CHALLENGE_PROVIDER
secrets: secrets:
- gandiv5_pat - gandiv5_personal_access_token
secrets: secrets:
gandiv5_pat: gandiv5_personal_access_token:
name: ${STACK_NAME}_gandiv5_pat_${SECRET_GANDIV5_PERSONAL_ACCESS_TOKEN_VERSION} name: ${STACK_NAME}_gandiv5_personal_access_token_${SECRET_GANDIV5_PERSONAL_ACCESS_TOKEN_VERSION}
external: true external: true

View File

@ -3,7 +3,7 @@ version: "3.8"
services: services:
app: app:
image: "traefik:v2.11.14" image: "traefik:v2.11.10"
# Note(decentral1se): *please do not* add any additional ports here. # Note(decentral1se): *please do not* add any additional ports here.
# Doing so could break new installs with port conflicts. Please use # Doing so could break new installs with port conflicts. Please use
# the usual `compose.$app.yml` approach for any additional ports # the usual `compose.$app.yml` approach for any additional ports
@ -27,7 +27,6 @@ services:
environment: environment:
- DASHBOARD_ENABLED - DASHBOARD_ENABLED
- LOG_LEVEL - LOG_LEVEL
- LOG_MAX_AGE=${LOG_MAX_AGE:0}
healthcheck: healthcheck:
test: ["CMD", "traefik", "healthcheck"] test: ["CMD", "traefik", "healthcheck"]
interval: 30s interval: 30s
@ -48,12 +47,11 @@ 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=3.1.0+v2.11.14" - "coop-cloud.${STACK_NAME}.version=2.8.0+v2.11.10"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}" - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
- "backupbot.backup=${ENABLE_BACKUPS:-true}"
socket-proxy: socket-proxy:
image: lscr.io/linuxserver/socket-proxy:1.26.2-r0-ls30 image: lscr.io/linuxserver/socket-proxy:1.26.2-r0-ls26
environment: environment:
- ALLOW_START=0 - ALLOW_START=0
- ALLOW_STOP=0 - ALLOW_STOP=0

View File

@ -7,6 +7,14 @@ export OVH_CONSUMER_KEY=$(cat "$OVH_CONSUMER_KEY_FILE")
export OVH_APPLICATION_SECRET=$(cat "$OVH_APPLICATION_SECRET_FILE") export OVH_APPLICATION_SECRET=$(cat "$OVH_APPLICATION_SECRET_FILE")
{{ end }} {{ end }}
{{ if eq (env "GANDI_API_KEY_ENABLED") "1" }}
export GANDIV5_API_KEY=$(cat "$GANDIV5_API_KEY_FILE")
{{ end }}
{{ if eq (env "GANDI_PERSONAL_ACCESS_TOKEN_ENABLED") "1" }}
export GANDIV5_PERSONAL_ACCESS_TOKEN=$(cat "$GANDIV5_PERSONAL_ACCESS_TOKEN_FILE")
{{ end }}
{{ if eq (env "DIGITALOCEAN_ENABLED") "1" }} {{ if eq (env "DIGITALOCEAN_ENABLED") "1" }}
export DO_AUTH_TOKEN=$(cat "$DO_AUTH_TOKEN_FILE") export DO_AUTH_TOKEN=$(cat "$DO_AUTH_TOKEN_FILE")
{{ end }} {{ end }}

View File

@ -1 +0,0 @@
Closes Security Issue https://github.com/traefik/traefik/security/advisories/GHSA-h924-8g65-j9wg

View File

@ -1 +0,0 @@
Adds log retention configuration option

View File

@ -1,8 +1,6 @@
--- ---
log: log:
level: {{ env "LOG_LEVEL" }} level: {{ env "LOG_LEVEL" }}
maxAge: {{ env "LOG_MAX_AGE" }}
providers: providers:
docker: docker: