revert 85d0c159b0

revert breaking log.maxAge change
fix default values and breaking configuration for LOG_MAX_AGE change
2025-02-20 20:16:10 +00:00 · 2025-02-20 14:42:13 -05:00 · 2025-02-19 17:21:22 -05:00 · 2025-02-19 17:20:04 -05:00 · 2025-02-19 22:15:04 +00:00 · 2025-02-19 16:09:01 -05:00
6 changed files with 9 additions and 21 deletions
--- 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=0

 # This is here so later lines can extend it; you likely don't wanna edit
 COMPOSE_FILE="compose.yml"
@ -147,7 +148,3 @@ COMPOSE_FILE="compose.yml"
 # NOTE(3wc): as of 2024-04-01 only the `icecast` recipe uses this
 #COMPOSE_FILE="$COMPOSE_FILE:compose.web-alt.yml"
 #WEB_ALT_ENABLED=1
-
-## Qbit
-#COMPOSE_FILE="$COMPOSE_FILE:compose.qbit.yml"
-#QBIT_ENABLED=1
--- a/compose.qbit.yml
+++ b/compose.qbit.yml
@ -1,8 +0,0 @@
-version: "3.8"
-services:
-  app:
-    environment:
-      - QBIT_ENABLED
-    ports:
-      - "6881:6881/udp"
-      - "6881:6881/tcp"
--- a/compose.yml
+++ b/compose.yml
@ -3,7 +3,7 @@ version: "3.8"

 services:
  app:
-    image: "traefik:v2.11.10"
+    image: "traefik:v2.11.14"
    # 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=${LOG_MAX_AGE:0}
    healthcheck:
      test: ["CMD", "traefik", "healthcheck"]
      interval: 30s
@ -47,12 +48,12 @@ services:
        - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
        - "traefik.http.routers.${STACK_NAME}.service=api@internal"
        - "traefik.http.routers.${STACK_NAME}.middlewares=security@file"
-        - "coop-cloud.${STACK_NAME}.version=2.8.0+v2.11.10"
+        - "coop-cloud.${STACK_NAME}.version=3.1.0+v2.11.14"
        - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
        - "backupbot.backup=${ENABLE_BACKUPS:-true}"

  socket-proxy:
-    image: lscr.io/linuxserver/socket-proxy:1.26.2-r0-ls26
+    image: lscr.io/linuxserver/socket-proxy:1.26.2-r0-ls30
    environment:
      - ALLOW_START=0
      - ALLOW_STOP=0
--- a/release/2.9.0+v2.11.14
+++ b/release/2.9.0+v2.11.14
@ -0,0 +1 @@
+Closes Security Issue https://github.com/traefik/traefik/security/advisories/GHSA-h924-8g65-j9wg
--- a/release/3.1.0+v2.11.14
+++ b/release/3.1.0+v2.11.14
@ -0,0 +1 @@
+Adds log retention configuration option
--- a/traefik.yml.tmpl
+++ b/traefik.yml.tmpl
@ -1,6 +1,8 @@
 ---
 log:
  level: {{ env "LOG_LEVEL" }}
+  maxAge: {{ env "LOG_MAX_AGE" }}
+

 providers:
  docker:
@ -79,12 +81,6 @@ entrypoints:
  matrix-federation:
    address: ":9001"
  {{ end }}
-  {{ if eq (env "QBIT_ENABLED") "1" }}
-  qbit:
-    address: ":6881"
-  qbit-udp:
-    address: ":6881/udp"
-  {{ end }}

 ping:
  entryPoint: web
Author	SHA1	Message	Date
marlon	5e4ba7f327	revert `85d0c159b0` revert breaking log.maxAge change	2025-02-20 20:16:10 +00:00
marlon	e21dbc655a	fix default values and breaking configuration for LOG_MAX_AGE change	2025-02-20 14:42:13 -05:00
marlon	b9d825b5c5	publish new version	2025-02-19 17:21:22 -05:00
marlon	74b3ee6716	chore: publish 3.1.0+v2.11.14 release	2025-02-19 17:20:04 -05:00
marlon	14d5d79520	Merge pull request 'Expose max log retention in traefik.yml' (#51 ) from sixsmith/traefik:master into master Reviewed-on: #51 Reviewed-by: marlon <marlon@riseup.net>	2025-02-19 22:15:04 +00:00
Raghav	7185e6ab43	Configure max log retention	2025-02-19 16:09:01 -05:00
Cassowary	85d0c159b0	Update .drone.yml All checks were successful continuous-integration/drone/push Build is passing Details	2025-01-08 10:09:13 -08:00
Moritz	6294944952	chore: publish 2.9.0+v2.11.14 release All checks were successful continuous-integration/drone/tag Build is passing Details continuous-integration/drone/push Build is passing Details	2024-12-03 19:33:59 +01:00
				`@ -0,0 +1 @@`
				`Closes Security Issue https://github.com/traefik/traefik/security/advisories/GHSA-h924-8g65-j9wg`