add qbit support

.drone.yml

@@ -8,7 +8,7 @@ steps:
       host: swarm-test.autonomic.zone
       stack: traefik
       networks:
-        - proxy
+       - proxy
       deploy_key:
         from_secret: drone_ssh_swarm_test
     environment:
@@ -16,7 +16,7 @@ steps:
       STACK_NAME: traefik
       LETS_ENCRYPT_ENV: production
       LETS_ENCRYPT_EMAIL: helo@autonomic.zone
-      TRAEFIK_YML_VERSION: v22
+      TRAEFIK_YML_VERSION: v21
       FILE_PROVIDER_YML_VERSION: v10
       ENTRYPOINT_VERSION: v4
 trigger:
@@ -34,7 +34,7 @@ steps:
         from_secret: drone_abra-bot_token
       fork: true
       repositories:
-        - toolshed/auto-recipes-catalogue-json
+        - coop-cloud/auto-recipes-catalogue-json
 
 trigger:
   event: tag

.env.sample

@@ -148,6 +148,6 @@ COMPOSE_FILE="compose.yml"
 #COMPOSE_FILE="$COMPOSE_FILE:compose.web-alt.yml"
 #WEB_ALT_ENABLED=1
 
-## Matrix
+## Qbit
-#COMPOSE_FILE="$COMPOSE_FILE:compose.irc.yml"
+#COMPOSE_FILE="$COMPOSE_FILE:compose.qbit.yml"
-#IRC_ENABLED=1
+#QBIT_ENABLED=1

compose.irc.yml

@@ -1,7 +0,0 @@
-version: "3.8"
-services:
-  app:
-    environment:
-      - IRC_ENABLED
-    ports:
-      - "6697:6697"

compose.qbit.yml

@@ -0,0 +1,8 @@
+version: "3.8"
+services:
+  app:
+    environment:
+      - QBIT_ENABLED
+    ports:
+      - "6881:6881/udp"
+      - "6881:6881/tcp"

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: "traefik:v3.4.4"
+    image: "traefik:v2.11.10"
     # 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
@@ -47,14 +47,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=3.3.0+v2.11.26"
+        - "coop-cloud.${STACK_NAME}.version=2.8.0+v2.11.10"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
         - "backupbot.backup=${ENABLE_BACKUPS:-true}"
 
   socket-proxy:
-    image: lscr.io/linuxserver/socket-proxy:1.26.2-r0-ls30
+    image: lscr.io/linuxserver/socket-proxy:1.26.2-r0-ls26
-    deploy:
-      endpoint_mode: dnsrr
     environment:
       - ALLOW_START=0
       - ALLOW_STOP=0
@@ -78,7 +76,7 @@ services:
       - SECRETS=0
       - SERVICES=1 # Needs access
       - SESSION=0
-      - SWARM=1
+      - SWARM=0
       - SYSTEM=0
       - TASKS=1 # Needs access
       - VERSION=1 # Needs access

release/2.9.0+v2.11.14

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

release/2.9.1+v2.11.14

@@ -1 +0,0 @@
-Reverts max log retention

release/3.0.0+v2.11.22

@@ -1,2 +0,0 @@
-socket-proxy: switch to endpoint-mode dnsrr instead of vip
-See https://git.coopcloud.tech/coop-cloud/traefik/pulls/50.

release/3.3.0+v2.11.26

@@ -1 +0,0 @@
-Fix CVE: https://github.com/traefik/traefik/security/advisories/GHSA-vrch-868g-9jx5

traefik.yml.tmpl

@@ -1,15 +1,13 @@
 ---
-core:
-  defaultRuleSyntax: v2
- 
 log:
   level: {{ env "LOG_LEVEL" }}
 
 providers:
-  swarm:
+  docker:
     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
@@ -70,10 +68,6 @@ entrypoints:
   compy:
     address: ":9999"
   {{ end }}
-  {{ if eq (env "IRC_ENABLED") "1" }}
-  irc:
-    address: ":6697"
-  {{ end }}
   {{ if eq (env "METRICS_ENABLED") "1" }}
   metrics:
     address: ":8082"
@@ -85,6 +79,12 @@ entrypoints:
   matrix-federation:
     address: ":9001"
   {{ end }}
+  {{ if eq (env "QBIT_ENABLED") "1" }}
+  qbit:
+    address: ":6881"
+  qbit-udp:
+    address: ":6881/udp"
+  {{ end }}
 
 ping:
   entryPoint: web