add qbit support

.drone.yml

@@ -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
 
-## Zulip
-#COMPOSE_FILE="$COMPOSE_FILE:compose.zulip.yml"
-#ZULIP_HTTPS_PROXY_ENABLED=1
+## Qbit
+#COMPOSE_FILE="$COMPOSE_FILE:compose.qbit.yml"
+#QBIT_ENABLED=1

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

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:v2.11.14"
+    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,12 +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=2.9.0+v2.11.14"
+        - "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
     environment:
       - ALLOW_START=0
       - ALLOW_STOP=0

compose.zulip.yml

@@ -1,6 +0,0 @@
-version: "3.8"
-services:
-  app:
-    deploy:
-      labels:
-        - "traefik.http.services.${STACK_NAME}.loadBalancer.serversTransport=zulip@file"

file-provider.yml.tmpl

@@ -1,10 +1,5 @@
 ---
 http:
-    {{ if eq (env "ZULIP_HTTPS_PROXY_ENABLED") "1" }}
-  serversTransports:
-    zulip:
-      insecureSkipVerify: true
-  {{ end }}
   middlewares:
     {{ if eq (env "KEYCLOAK_MIDDLEWARE_ENABLED") "1" }}
     keycloak:

release/2.9.0+v2.11.14

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

traefik.yml.tmpl

@@ -79,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