feat: configurable timeouts

.env.sample

@@ -159,10 +159,6 @@ WRITE_TIMEOUT=0s
 #COMPOSE_FILE="$COMPOSE_FILE:compose.smtp.yml"
 #SMTP_ENABLED=1
 
-## PGSQL recipe open port 5432
-#COMPOSE_FILE="$COMPOSE_FILE:compose.pgsql.yml"
-#PGSQL_ENABLED=1
-
 ## Compy
 #COMPOSE_FILE="$COMPOSE_FILE:compose.compy.yml"
 #COMPY_ENABLED=1
@@ -227,8 +223,5 @@ WRITE_TIMEOUT=0s
 #ANUBIS_SERVE_ROBOTS_TXT=true
 #ANUBIS_SLOG_LEVEL=INFO
 
-## Anubis metrics
-#COMPOSE_FILE="$COMPOSE_FILE:compose.anubis-metrics.yml"
-
 ## Enable onion service support
 #ONION_ENABLED=1

README.md

@@ -5,7 +5,7 @@
 > https://docs.traefik.io
 
 <!-- metadata -->
-* **Maintainer**: [@p4u1](https://git.coopcloud.tech/p4u1), [@javielico](https://git.coopcloud.tech/javielico), Local-IT: [@moritz](https://git.coopcloud.tech/moritz), [@msimon](https://git.coopcloud.tech/simon), [@carla](https://git.coopcloud.tech/carla)
+* **Maintainer**: [@p4u1](https://git.coopcloud.tech/p4u1), [@decentral1se](https://git.coopcloud.tech/decentral1se), [@javielico](https://git.coopcloud.tech/javielico), Local-IT: [@moritz](https://git.coopcloud.tech/moritz), [@msimon](https://git.coopcloud.tech/simon), [@carla](https://git.coopcloud.tech/carla)
 * **Status**: `stable`
 * **Category**: Utilities
 * **Features**: ?
@@ -72,9 +72,6 @@ After deploying these changes, go to each recipe that supports Anubis
 and follow the process there.  **Enabling Anubis here is not enough for
 protection your apps.**
 
-If you want to collect Prometheus metrics for Anubis, for instance with
-[monitoring-ng](/monitoring-ng), uncomment the "Anubis metrics" section.
-
 ## Enabling onion service
 
 Uncomment the line in the config setting `ONION_ENABLED=1`. This will create a new entrypoint on port 9052 which can be used to bypass forced SSL. For more details, see the [onion recipe](https://recipes.coopcloud.tech/onion).

abra.sh

@@ -1,4 +1,3 @@
-export TRAEFIK_YML_VERSION=v34
-export FILE_PROVIDER_YML_VERSION=v14
-export ENTRYPOINT_VERSION=v8
-export IOCAINE_ENTRYPOINT_VERSION=v1
+export TRAEFIK_YML_VERSION=v31a
+export FILE_PROVIDER_YML_VERSION=v12
+export ENTRYPOINT_VERSION=v5

anubis.yml.tmpl

@@ -1,7 +0,0 @@
-bots:
-- import: (data)/meta/default-config.yaml
-{{ if eq (env "ANUBIS_METRICS_ENABLED") "true" }}
-metrics:
-  bind: ":9090"
-  network: "tcp"
-{{ end }}

compose.anubis-metrics.yml

@@ -1,11 +0,0 @@
----
-version: "3.8"
-services:
-  anubis:
-    environment:
-      ANUBIS_METRICS_ENABLED: "true"
-    deploy:
-      labels:
-      - "prometheus.io/scrape=true"
-      - "prometheus.io/port=9090"
-      - "prometheus.io/path=/metrics"

compose.anubis.yml

@@ -5,9 +5,8 @@ services:
     deploy:
       labels:
       - "traefik.http.middlewares.anubis.forwardauth.address=http://anubis:8080/.within.website/x/cmd/anubis/api/check"
-      - "traefik.http.middlewares.anubis.forwardauth.trustForwardHeader=true"
   anubis:
-    image: "ghcr.io/techarohq/anubis:v1.27.0"
+    image: "ghcr.io/techarohq/anubis:v1.25.0"
     environment:
       BIND: ":8080"
       TARGET: " "
@@ -19,10 +18,6 @@ services:
       OG_CACHE_CONSIDER_HOST: "${ANUBIS_OG_CACHE_CONSIDER_HOST}"
       SERVE_ROBOTS_TXT: "${ANUBIS_SERVE_ROBOTS_TXT}"
       SLOG_LEVEL: "${ANUBIS_SLOG_LEVEL:-INFO}"
-      POLICY_FNAME: "/data/cfg/botPolicy.yaml"
-    configs:
-    - source: anubis_yml
-      target: /data/cfg/botPolicy.yaml
     networks:
     - proxy
     deploy:
@@ -33,8 +28,3 @@ services:
       - "traefik.http.routers.anubis.entrypoints=web-secure"
       - "traefik.http.services.anubis.loadbalancer.server.port=8080"
       - "traefik.http.routers.anubis.service=anubis"
-configs:
-  anubis_yml:
-    name: ${STACK_NAME}_anubis_yml_${ANUBIS_YML_VERSION}
-    file: anubis.yml.tmpl
-    template_driver: golang

compose.iocaine.yml

@@ -1,22 +0,0 @@
----
-version: "3.8"
-
-services:
-  app:
-    environment:
-      IOCAINE_ENABLE: "1"
-      IOCAINE_PLUGIN_VERSION: "v1.2.0"
-    volumes:
-      - "plugins-local:/plugins-local"
-
-  iocaine:
-    image: "git.madhouse-project.org/iocaine/iocaine:3.5.0"
-    environment:
-      RUST_LOG: "iocaine=info"
-    ports:
-      - "127.0.0.1:42069:42069"
-    networks:
-      - proxy
-
-volumes:
-  plugins-local:

compose.pgsql.yml

@@ -1,12 +0,0 @@
----
-version: "3.8"
-
-services:
-  app:
-    environment:
-      - PGSQL_ENABLED
-    ports:
-      - target: 5432
-        published: 5432
-        protocol: tcp
-        mode: host

compose.yml

@@ -3,7 +3,7 @@ version: "3.8"
 
 services:
   app:
-    image: "traefik:v3.7.10"
+    image: "traefik:v3.7.5"
     # 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,9 +27,6 @@ services:
       - source: entrypoint
         target: /custom-entrypoint.sh
         mode: 0555
-      - source: iocaine_entrypoint
-        target: /entrypoint.iocaine.sh
-        mode: 0555
     networks:
       - proxy
       - internal
@@ -60,12 +57,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=6.1.0+v3.7.10"
+        - "coop-cloud.${STACK_NAME}.version=5.1.1+v3.6.15"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
         - "backupbot.backup=${ENABLE_BACKUPS:-true}"
 
   socket-proxy:
-    image: lscr.io/linuxserver/socket-proxy:3.4.3
+    image: lscr.io/linuxserver/socket-proxy:3.4.0
     deploy:
       endpoint_mode: dnsrr
     environment:
@@ -120,10 +117,6 @@ configs:
     name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
     file: entrypoint.sh.tmpl
     template_driver: golang
-  iocaine_entrypoint:
-    name: ${STACK_NAME}_entrypoint_${IOCAINE_ENTRYPOINT_VERSION}
-    file: entrypoint.iocaine.sh.tmpl
-    template_driver: golang
 
 volumes:
   letsencrypt:

entrypoint.iocaine.sh.tmpl

@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-
-apk --no-cache add git go
-iocaine_path="/plugins-local/src/git.mstar.dev/mstar/traefik-iocaine-middleware"
-if [ ! -d "$iocaine_path" ]; then
-  git clone --depth 1 --branch $IOCAINE_PLUGIN_VERSION https://git.mstar.dev/mstar/traefik-iocaine-middleware.git $iocaine_path
-else
-	git -C $iocaine_path fetch origin 'refs/tags/*:refs/tags/*'
-	git -C $iocaine_path checkout tags/$IOCAINE_PLUGIN_VERSION
-fi
-(cd $iocaine_path && go mod vendor)
-
-exit 0

entrypoint.sh.tmpl

@@ -15,8 +15,4 @@ export DO_AUTH_TOKEN=$(cat "$DO_AUTH_TOKEN_FILE")
 export AZURE_CLIENT_SECRET=$(cat "$AZURE_CLIENT_SECRET_FILE")
 {{ end }}
 
-{{ if eq (env "IOCAINE_ENABLE") "1" }}
-/entrypoint.iocaine.sh
-{{ end }}
-
 /entrypoint.sh "$@"

file-provider.yml.tmpl

@@ -17,15 +17,6 @@ http:
         authResponseHeaders:
           - X-Forwarded-User
     {{ end }}
-    {{ if eq (env "IOCAINE_ENABLE") "1" }}
-    iocaine:
-      plugin:
-        iocaine:
-          iocaineHttpUrl: "http://iocaine:42069"
-          methods:
-            - GET
-            - HEAD
-    {{ end }}
     {{ if eq (env "BASIC_AUTH") "1" }}
     basicauth:
       basicAuth:
@@ -70,4 +61,4 @@ tls:
   certificates:
     - certFile: /run/secrets/ssl_cert
       keyFile: /run/secrets/ssl_key
-  {{ end }}
+  {{ end }}

release/6.0.0+v3.7.7

@@ -1,13 +0,0 @@
-!Breaking: Starting with v3.6.16, the Docker provider requires Docker API version v1.40 or above (Docker Engine v19.03). Users running older (end of life) versions of Docker Engine should update their Docker Engine or use the DOCKER_API_VERSION environment variable to override the API version used by Traefik.
-
-letsencrypt: Avoid HTTP-01 challenge if `LETS_ENCRYPT_DNS_CHALLENGE_ENABLED` is set, in order to rely on DNS-01 challenges for servers not exposed to the internet.
-
-matrix-federation: Entrypoint was changed to :8448 to match published port
-
-fix: ensure large uploads work. You can now set the following env vars:
-- READ_TIMEOUT
-- WRITE_TIMEOUT
-
-cloudflare: Add Cloudflare as DNS provider
-
-For more information take a look at the migration guide: https://doc.traefik.io/traefik/v3.7/migrate/v3/#v377

release/6.1.0+v3.7.10

@@ -1 +0,0 @@
-Adds option ability to open ports for PGSQL recipe, new version of anubis, and ability to add anubis metrics on this release.

release/next

@@ -0,0 +1 @@
+letsencrypt: Avoid HTTP-01 challenge if `LETS_ENCRYPT_DNS_CHALLENGE_ENABLED` is set, in order to rely on DNS-01 challenges for servers not exposed to the internet.

traefik.yml.tmpl

@@ -46,10 +46,6 @@ entrypoints:
         allowEncodedPercent: true
         allowEncodedQuestionMark: true
         allowEncodedHash: true
-			{{- if eq (env "IOCAINE_ENABLE") "1" }}
-      middlewares:
-        - iocaine@file
-			{{- end }}
   {{- if eq (env "GITEA_SSH_ENABLED") "1" }}
   gitea-ssh:
     address: ":2222"
@@ -104,7 +100,7 @@ entrypoints:
   {{- end }}
   {{- if eq (env "MATRIX_FEDERATION_ENABLED") "1" }}
   matrix-federation:
-    address: ":8448"
+    address: ":9001"
   {{- end }}
   {{- if eq (env "NEXTCLOUD_TALK_HPB_ENABLED") "1" }}
   nextcloud-talk-hpb:
@@ -161,10 +157,3 @@ certificatesResolvers:
           - "1.1.1.1:53"
           - "9.9.9.9:53"
       {{- end }}
-
-{{ if eq (env "IOCAINE_ENABLE") "1" }}
-experimental:
-  localPlugins:
-    iocaine:
-      moduleName: git.mstar.dev/mstar/traefik-iocaine-middleware
-{{ end }}