diff --git a/.env.sample b/.env.sample index 558e4d2..d62cfa9 100644 --- a/.env.sample +++ b/.env.sample @@ -10,6 +10,7 @@ LETS_ENCRYPT_EMAIL=certs@example.com # DASHBOARD_ENABLED=true # WARN, INFO etc. LOG_LEVEL=WARN +LOG_MAX_AGE=1 # This is here so later lines can extend it; you likely don't wanna edit COMPOSE_FILE="compose.yml" diff --git a/abra.sh b/abra.sh index 70c5cfc..07f3312 100644 --- a/abra.sh +++ b/abra.sh @@ -1,3 +1,3 @@ -export TRAEFIK_YML_VERSION=v21 +export TRAEFIK_YML_VERSION=v22 export FILE_PROVIDER_YML_VERSION=v10 export ENTRYPOINT_VERSION=v4 diff --git a/compose.yml b/compose.yml index 1b052a0..8156dcf 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: "traefik:v2.11.24" + image: "traefik:v3.3.7" # Note(decentral1se): *please do not* add any additional ports here. # Doing so could break new installs with port conflicts. Please use # the usual `compose.$app.yml` approach for any additional ports @@ -27,6 +27,7 @@ services: environment: - DASHBOARD_ENABLED - LOG_LEVEL + - LOG_MAX_AGE healthcheck: test: ["CMD", "traefik", "healthcheck"] interval: 30s @@ -78,7 +79,7 @@ services: - SECRETS=0 - SERVICES=1 # Needs access - SESSION=0 - - SWARM=0 + - SWARM=1 - SYSTEM=0 - TASKS=1 # Needs access - VERSION=1 # Needs access diff --git a/traefik.yml.tmpl b/traefik.yml.tmpl index f2af6ad..ec1552d 100644 --- a/traefik.yml.tmpl +++ b/traefik.yml.tmpl @@ -1,13 +1,16 @@ --- +core: + defaultRuleSyntax: v2 + log: level: {{ env "LOG_LEVEL" }} + maxAge: {{ env "LOG_MAX_AGE" }} providers: - docker: + swarm: endpoint: "tcp://socket-proxy:2375" exposedByDefault: false network: proxy - swarmMode: true {{ if eq (env "FILE_PROVIDER_DIRECTORY_ENABLED") "1" }} file: directory: /etc/traefik/file-providers