From 91b87ea091869fff9ca027640e0fa028c1fc8bed Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Sat, 6 Jul 2024 21:47:27 +0200
Subject: [PATCH 01/23] add authentik

---
 peach/docker-compose.yml | 67 ++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 40 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index 21484b3..a0127b4 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -20,15 +20,6 @@ networks:
                   gateway: 2a01:e0a:5b7:35f1::1
 
 services:
-    openldap:
-        image: openldap-alpine
-        volumes:
-            - /srv/docker/volume/openldap/config/openldap:/etc/openldap
-            - /srv/docker/volume/openldap/mdb:/var/lib/openldap/openldap-data
-            - ssl:/ssl
-        ports:
-            - 389:389
-        restart: always
     postgres:
         image: postgres:15-alpine
         volumes:
@@ -41,16 +32,6 @@ services:
             default:
                 ipv6_address: 2a01:e0a:5b7:35f1::5432
         restart: always
-    vault:
-        image: hashicorp/vault
-        volumes:
-            - /srv/docker/volume/vault:/vault
-        restart: always
-        mem_limit: 128M
-        dns: 192.168.3.2
-        cap_add:
-          - IPC_LOCK
-        command: vault server -config /vault/config
     caddy:
         image: caddy-alpine
         volumes:
@@ -68,6 +49,7 @@ services:
         networks:
             default:
                 ipv6_address: 2a01:e0a:5b7:35f1::443
+                ipv4_address: 172.20.0.250
     redis:
         image: redis:alpine
         restart: always
@@ -156,6 +138,7 @@ services:
             - "click.vpn6:fd00::42:6"
             - "quizz.vpn6:fd00::42:8"
             - "kiwi.verry.org:2a01:e0a:5b7:35f3::6"
+            - "banana.verry.org:2a01:e0a:5b7:35f3::11"
             - "backup-01.dinoutoo.vpn:192.168.42.9"
             - "home.verry.org:2a01:e0a:5b7:35f1::443"
             - "mail.verry.org:192.168.3.5"
@@ -262,22 +245,6 @@ services:
         restart: always
         environment:
             - WHOAMI_NAME=iamverry
-    linkding:
-        image: sissbruecker/linkding:latest
-        volumes:
-            - /srv/docker/volume/linkding:/etc/linkding/data
-        restart: always
-        mem_limit: 1G
-        env_file: env/linkding
-        command: uwsgi --http [::]:9090 uwsgi.ini
-    drone:
-        image: drone/drone:2
-        restart: always
-        env_file: env/drone
-    drone-runner-ssh:
-        image: drone/drone-runner-ssh
-        restart: always
-        env_file: env/drone-runner-ssh
 #    minio:
 #        image: minio/minio
 #        volumes:
@@ -313,6 +280,31 @@ services:
         restart: always
         mem_limit: 1G
         cpus: 1
+    authentik-server:
+        image: ghcr.io/goauthentik/server:2024.6.0
+        restart: unless-stopped
+        command: server
+        volumes:
+            - /srv/docker/volume/authentik/media:/media
+            - /srv/docker/volume/authentik/custom-templates:/templates
+        env_file:
+           - env/authentik-server
+        depends_on:
+            - postgres
+            - redis
+    authentik-worker:
+        image: ghcr.io/goauthentik/server:2024.6.0
+        restart: unless-stopped
+        command: worker
+        volumes:
+            - /srv/docker/volume/authentik/media:/media
+            - /srv/docker/volume/authentik/certs:/certs
+            - /srv/docker/volume/authentik/custom-templates:/templates
+        env_file:
+            - env/authentik-worker
+        depends_on:
+            - postgres
+            - redis
     uptime-kuma:
         image: louislam/uptime-kuma
         volumes:
@@ -320,11 +312,6 @@ services:
         restart: always
         mem_limit: 2G
         cpus: 1
-    openspeedtest:
-        environment:
-          - ENABLE_LETSENCRYPT=False
-          - DOMAIN_NAME=speedtest.verry.org
-        image: "openspeedtest/latest"
     geoipupdate:
         image: "maxmindinc/geoipupdate:latest"
         volumes:

From a7dd9844bc9b89b54a3f44a3b64bc8a0f5a64b71 Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Wed, 24 Jul 2024 20:10:01 +0200
Subject: [PATCH 02/23] pg16

---
 peach/docker-compose.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index a0127b4..2ef5a12 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -5,6 +5,8 @@ volumes:
         external: true
     postgres-15:
         external: true
+    postgres-16:
+        external: true
 
 networks:
     default:
@@ -21,9 +23,9 @@ networks:
 
 services:
     postgres:
-        image: postgres:15-alpine
+        image: postgres:16-alpine
         volumes:
-            - postgres-15:/var/lib/postgresql/data
+            - postgres-16:/var/lib/postgresql/data
             - ssl:/ssl:ro
         dns: fd00::3:2
         environment:
@@ -33,9 +35,9 @@ services:
                 ipv6_address: 2a01:e0a:5b7:35f1::5432
         restart: always
     caddy:
-        image: caddy-alpine
+        image: caddy:alpine
         volumes:
-            - ssl:/etc/dehydrated:ro
+            - ssl:/ssl:ro
             - /etc/caddy:/etc/caddy
             - /srv/www:/srv/www
             - /srv/www/nfs/kiwi/Videos:/srv/www/nfs/kiwi/Videos:ro
@@ -105,7 +107,7 @@ services:
         restart: always
         mem_limit: 1G
     miniflux:
-        image: miniflux/miniflux
+        image: miniflux/miniflux:latest-distroless
         env_file: env/miniflux
         restart: always
         mem_limit: 128M

From 35cd12e607ae494d36497152fcc135311c850cb1 Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Thu, 8 Aug 2024 23:17:47 +0200
Subject: [PATCH 03/23] add more memory on uptime kuma

---
 peach/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index 2ef5a12..add74c7 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -312,7 +312,7 @@ services:
         volumes:
           - /srv/docker/volume/uptime-kuma/data:/app/data:rw
         restart: always
-        mem_limit: 2G
+        mem_limit: 4G
         cpus: 1
     geoipupdate:
         image: "maxmindinc/geoipupdate:latest"

From b283f091ff3775bbc0e2f51cb640d86d84d87454 Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Fri, 23 Aug 2024 23:43:08 +0200
Subject: [PATCH 04/23] homeassistant docker

---
 peach/docker-compose.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index add74c7..96fcbaf 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -307,6 +307,13 @@ services:
         depends_on:
             - postgres
             - redis
+    homeassistant:
+        image: ghcr.io/home-assistant/home-assistant:stable
+        environment:
+            - TZ='Europe/Paris'
+        volumes:
+          - /srv/docker/volume/homeassistant:/config
+        restart: always
     uptime-kuma:
         image: louislam/uptime-kuma
         volumes:

From 555b78c37b791de96031a7e2cfb5196a8abfbb97 Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Sun, 22 Sep 2024 17:58:30 +0200
Subject: [PATCH 05/23] victorialogs

---
 peach/docker-compose.yml | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index 96fcbaf..735913f 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -46,7 +46,7 @@ services:
             - 443:443
             - 443:443/udp
             - 80:80
-        mem_limit: 128M
+        mem_limit: 1G
         command: caddy run --config /etc/caddy/Caddyfile --adapter caddyfile
         networks:
             default:
@@ -86,6 +86,9 @@ services:
         command: /run/powerdns_exporter -api-url http://pdns:8081/api/v1/ -api-key ${API_KEY}
     grafana:
         image: grafana/grafana
+        environment:
+        - GF_INSTALL_PLUGINS=https://github.com/VictoriaMetrics/victorialogs-datasource/releases/download/v0.4.0/victorialogs-datasource-v0.4.0.zip;victorialogs-datasource
+        - GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=victorialogs-datasource
         volumes:
             - /srv/docker/volume/grafana/grafana.ini:/etc/grafana/grafana.ini
         restart: always
@@ -326,3 +329,24 @@ services:
         volumes:
           - "/srv/docker/volume/geoip:/usr/share/GeoIP"
         env_file: env/geoipupdate
+    vikunja:
+        image: vikunja/vikunja
+        env_file:
+            - env/vikunja
+        volumes:
+          - /srv/docker/volume/vikunja:/app/vikunja/files
+        depends_on:
+          - postgres
+        restart: unless-stopped
+    ring-mqtt:
+        container_name: ring-mqtt
+        restart: unless-stopped
+        image: tsightler/ring-mqtt
+        ports:
+          - 8554:8554                      # Enable RTSP port for external media player access
+        volumes:
+          - /srv/docker/volume/ring-mqtt:/data           # Mapping of local folder to provide persistent storage
+        logging:                           #limit logs to 10m and 3 files
+          options:
+            max-size: 10m
+            max-file: "3"

From a75073d971c39757f72203e1db8c2b27991cbaba Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Sun, 22 Sep 2024 18:15:54 +0200
Subject: [PATCH 06/23] victoriametricslogs

---
 peach/docker-compose.yml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index 735913f..f7566cc 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -329,6 +329,27 @@ services:
         volumes:
           - "/srv/docker/volume/geoip:/usr/share/GeoIP"
         env_file: env/geoipupdate
+    vector:
+        image: timberio/vector:latest-alpine
+        env_file:
+          - env/vector
+        volume:
+          - "/srv/docker/volume/vector/vector.yaml:/etc/vector/vector.yaml:ro"
+        depends_on:
+          - vector
+        restart: unless-stopped
+    victorialogs:
+        image: victoriametrics/victoria-logs:latest-scratch
+        env_file:
+            - env/victorialogs
+        volumes:
+          - /srv/docker/volume/victoria-logs/data:/vlogs
+        command:
+          - -storageDataPath=/vlogs
+          - -loggerFormat=json
+        depends_on:
+          - caddy
+        restart: unless-stopped
     vikunja:
         image: vikunja/vikunja
         env_file:

From 3ccb36328c6dbe8a38ee1429e640b09f77fcd3fe Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Mon, 30 Sep 2024 20:50:09 +0200
Subject: [PATCH 07/23] vmlogs vector

---
 peach/docker-compose.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index f7566cc..1d16238 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -65,12 +65,13 @@ services:
             default:
                 ipv6_address: 2a01:e0a:5b7:35f1::6379
     pdns:
-        image: pdns-alpine
+        image: pdns-auth-49:latest
         volumes:
             - /srv/docker/volume/pdns.conf:/etc/pdns/pdns.conf:ro
         ports:
             - "53:53/udp"
             - "53:53/tcp"
+        command: /usr/sbin/pdns_server --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no
         restart: always
         mem_limit: 128M
         dns: 192.168.3.2
@@ -260,7 +261,7 @@ services:
 #        mem_limit: 1G
 #        cpus: 0.5
     matrixsyncv3:
-        image: alpine:3.18
+        image: alpine:3.20
         env_file: env/matrixsyncv3
         volumes:
             - /srv/docker/volume/sliding-sync/bin/syncv3:/bin/syncv3
@@ -333,10 +334,10 @@ services:
         image: timberio/vector:latest-alpine
         env_file:
           - env/vector
-        volume:
-          - "/srv/docker/volume/vector/vector.yaml:/etc/vector/vector.yaml:ro"
+        volumes:
+          - /srv/docker/volume/vector/vector.yaml:/etc/vector/vector.yaml:ro
         depends_on:
-          - vector
+          - victorialogs
         restart: unless-stopped
     victorialogs:
         image: victoriametrics/victoria-logs:latest-scratch
@@ -350,6 +351,9 @@ services:
         depends_on:
           - caddy
         restart: unless-stopped
+        networks:
+            default:
+                ipv6_address: 2a01:e0a:5b7:35f1::5000
     vikunja:
         image: vikunja/vikunja
         env_file:

From f92851909f5c3d670fb2ac42cf82be3586359431 Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Sun, 17 Nov 2024 21:42:19 +0100
Subject: [PATCH 08/23] initial pg17 support

---
 peach/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index 1d16238..9f4ad42 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -3,10 +3,10 @@ volumes:
         external: true
     victoria-metrics:
         external: true
-    postgres-15:
-        external: true
     postgres-16:
         external: true
+    postgres-17:
+        external: true
 
 networks:
     default:

From 75623657b336e427679e25d3f7c308c30a89250e Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Sun, 2 Feb 2025 18:25:31 +0100
Subject: [PATCH 09/23] update bumb 20250202

---
 peach/docker-compose.yml | 34 +++++++++-------------------------
 peach/reload.sh          |  2 +-
 2 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index 9f4ad42..7b9b5e2 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -69,8 +69,8 @@ services:
         volumes:
             - /srv/docker/volume/pdns.conf:/etc/pdns/pdns.conf:ro
         ports:
-            - "53:53/udp"
-            - "53:53/tcp"
+            - "192.168.3.10:53:53/udp"
+            - "192.168.3.10:53:53/tcp"
         command: /usr/sbin/pdns_server --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no
         restart: always
         mem_limit: 128M
@@ -86,7 +86,7 @@ services:
         mem_limit: 128M
         command: /run/powerdns_exporter -api-url http://pdns:8081/api/v1/ -api-key ${API_KEY}
     grafana:
-        image: grafana/grafana
+        image: grafana/grafana:11.4.1
         environment:
         - GF_INSTALL_PLUGINS=https://github.com/VictoriaMetrics/victorialogs-datasource/releases/download/v0.4.0/victorialogs-datasource-v0.4.0.zip;victorialogs-datasource
         - GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=victorialogs-datasource
@@ -103,13 +103,6 @@ services:
         volumes:
             - /srv/www:/srv/www
         restart: always
-    loki:
-        image: grafana/loki
-        volumes:
-            - /srv/docker/volume/loki/config/loki-docker-config.yaml:/etc/loki/local-config.yaml:ro
-            - /srv/docker/volume/loki/data:/loki:rw
-        restart: always
-        mem_limit: 1G
     miniflux:
         image: miniflux/miniflux:latest-distroless
         env_file: env/miniflux
@@ -198,20 +191,6 @@ services:
         mem_limit: 128M
         volumes:
             - /srv/docker/volume/promtail:/etc/promtail:ro
-    rsyslog:
-        image: rsyslog-alpine
-        restart: always
-        volumes:
-            - /srv/docker/volume/rsyslog/config/rsyslog.conf:/etc/rsyslog.conf:ro
-            - /srv/docker/volume/rsyslog/data:/data
-        ports:
-            - 514:514/udp
-            - 514:514
-        dns: 192.168.3.2
-        mem_limit: 128M
-        networks:
-            default:
-                ipv6_address: 2a01:e0a:5b7:35f1::514
     victoria:
         image: victoriametrics/victoria-metrics
         volumes:
@@ -261,7 +240,7 @@ services:
 #        mem_limit: 1G
 #        cpus: 0.5
     matrixsyncv3:
-        image: alpine:3.20
+        image: alpine:3.21
         env_file: env/matrixsyncv3
         volumes:
             - /srv/docker/volume/sliding-sync/bin/syncv3:/bin/syncv3
@@ -348,6 +327,11 @@ services:
         command:
           - -storageDataPath=/vlogs
           - -loggerFormat=json
+          - -syslog.listenAddr.tcp=:514 
+          - -syslog.listenAddr.udp=:514
+        ports:
+          - 514:514                      # syslog/tcp
+          - 514:514/udp                  # syslog/udp
         depends_on:
           - caddy
         restart: unless-stopped
diff --git a/peach/reload.sh b/peach/reload.sh
index e38915e..7872629 100755
--- a/peach/reload.sh
+++ b/peach/reload.sh
@@ -4,4 +4,4 @@
 cd "$(dirname "$0")"
 
 #docker-compose pull --ignore-pull-failures
-docker-compose up -d
+docker-compose up -d --remove-orphans

From de111d674fc6259130d020d6e76b23a2cfa3d684 Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Sat, 1 Mar 2025 22:43:06 +0100
Subject: [PATCH 10/23] mqtt

---
 peach/docker-compose.yml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index 7b9b5e2..fc4906c 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -35,7 +35,7 @@ services:
                 ipv6_address: 2a01:e0a:5b7:35f1::5432
         restart: always
     caddy:
-        image: caddy:alpine
+        image: caddy-alpine:latest
         volumes:
             - ssl:/ssl:ro
             - /etc/caddy:/etc/caddy
@@ -240,14 +240,9 @@ services:
 #        mem_limit: 1G
 #        cpus: 0.5
     matrixsyncv3:
-        image: alpine:3.21
+        image: ghcr.io/matrix-org/sliding-sync:latest
         env_file: env/matrixsyncv3
-        volumes:
-            - /srv/docker/volume/sliding-sync/bin/syncv3:/bin/syncv3
         restart: always
-        command: /bin/syncv3
-        mem_limit: 1G
-        cpus: 1
     dendrite:
         image: matrixdotorg/dendrite-monolith:latest
         volumes:
@@ -257,7 +252,7 @@ services:
             - /srv/docker/volume/dendrite/logs:/var/dendrite/logs
             - /srv/docker/volume/dendrite/jetstream:/var/dendrite/jetstream
         restart: always
-        mem_limit: 1G
+        mem_limit: 2G
         cpus: 1
     matrix-alertmanager:
         image: jaywink/matrix-alertmanager:latest
@@ -290,6 +285,17 @@ services:
         depends_on:
             - postgres
             - redis
+    mosquitto:
+        image: eclipse-mosquitto
+        volumes:
+          - /srv/docker/volume/mosquitto/config:/mosquitto/config
+          - /srv/docker/volume/mosquitto/data:/mosquitto/data
+        ports:
+          - 1883:1883 #mqtt
+        restart: always
+        networks:
+            default:
+                ipv6_address: 2a01:e0a:5b7:35f1::1883
     homeassistant:
         image: ghcr.io/home-assistant/home-assistant:stable
         environment:

From 272d38204f6ce3f3657ec531216c736ff94e5303 Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Fri, 28 Mar 2025 21:42:19 +0100
Subject: [PATCH 11/23] pg16 to 17

---
 peach/docker-compose.yml | 50 +++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index fc4906c..457297f 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -1,4 +1,6 @@
 volumes:
+    conduwuit-db:
+        external: true
     ssl:
         external: true
     victoria-metrics:
@@ -22,12 +24,19 @@ networks:
                   gateway: 2a01:e0a:5b7:35f1::1
 
 services:
-    postgres:
+    postgres16:
         image: postgres:16-alpine
         volumes:
             - postgres-16:/var/lib/postgresql/data
             - ssl:/ssl:ro
-        dns: fd00::3:2
+        environment:
+            - POSTGRES_PASSWORD=J5PdCv9ObVh5uZCJDpndzXoUumAKn52K
+        restart: always
+    postgres:
+        image: postgres:17-alpine
+        volumes:
+            - postgres-17:/var/lib/postgresql/data
+            - ssl:/ssl:ro
         environment:
             - POSTGRES_PASSWORD=J5PdCv9ObVh5uZCJDpndzXoUumAKn52K
         networks:
@@ -213,7 +222,7 @@ services:
             default:
                 ipv6_address: 2a01:e0a:5b7:35f1::853
     gitea:
-        image: codeberg.org/forgejo/forgejo:7
+        image: codeberg.org/forgejo/forgejo:10
         volumes:
             - /srv/docker/volume/gitea/data:/data
         restart: always
@@ -243,8 +252,18 @@ services:
         image: ghcr.io/matrix-org/sliding-sync:latest
         env_file: env/matrixsyncv3
         restart: always
+    conduwuit:
+        image: girlbossceo/conduwuit
+        env_file: env/conduwuit
+        volumes:
+            - /srv/docker/volume/conduwuit/config:/config:ro
+            - /srv/docker/volume/conduwuit/db-backup:/db-backup:rw
+            - conduwuit-db:/db:rw
+        restart: always
+        mem_limit: 2G
+        cpus: 1
     dendrite:
-        image: matrixdotorg/dendrite-monolith:latest
+        image: matrixdotorg/dendrite-monolith:main
         volumes:
             - /srv/docker/volume/dendrite/dendrite.yaml:/etc/dendrite/dendrite.yaml:ro
             - /srv/docker/volume/dendrite/cert:/cert:ro
@@ -288,6 +307,7 @@ services:
     mosquitto:
         image: eclipse-mosquitto
         volumes:
+          - ssl:/ssl:ro
           - /srv/docker/volume/mosquitto/config:/mosquitto/config
           - /srv/docker/volume/mosquitto/data:/mosquitto/data
         ports:
@@ -321,29 +341,7 @@ services:
           - env/vector
         volumes:
           - /srv/docker/volume/vector/vector.yaml:/etc/vector/vector.yaml:ro
-        depends_on:
-          - victorialogs
         restart: unless-stopped
-    victorialogs:
-        image: victoriametrics/victoria-logs:latest-scratch
-        env_file:
-            - env/victorialogs
-        volumes:
-          - /srv/docker/volume/victoria-logs/data:/vlogs
-        command:
-          - -storageDataPath=/vlogs
-          - -loggerFormat=json
-          - -syslog.listenAddr.tcp=:514 
-          - -syslog.listenAddr.udp=:514
-        ports:
-          - 514:514                      # syslog/tcp
-          - 514:514/udp                  # syslog/udp
-        depends_on:
-          - caddy
-        restart: unless-stopped
-        networks:
-            default:
-                ipv6_address: 2a01:e0a:5b7:35f1::5000
     vikunja:
         image: vikunja/vikunja
         env_file:

From 8f0441b3d9c3191c32060fdcbf2d62463b6a61da Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Fri, 25 Apr 2025 16:09:39 +0200
Subject: [PATCH 12/23] 20250425 autocommit

---
 peach/docker-compose.yml | 36 ++++--------------------------------
 1 file changed, 4 insertions(+), 32 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index 457297f..4169440 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -5,8 +5,6 @@ volumes:
         external: true
     victoria-metrics:
         external: true
-    postgres-16:
-        external: true
     postgres-17:
         external: true
 
@@ -24,14 +22,6 @@ networks:
                   gateway: 2a01:e0a:5b7:35f1::1
 
 services:
-    postgres16:
-        image: postgres:16-alpine
-        volumes:
-            - postgres-16:/var/lib/postgresql/data
-            - ssl:/ssl:ro
-        environment:
-            - POSTGRES_PASSWORD=J5PdCv9ObVh5uZCJDpndzXoUumAKn52K
-        restart: always
     postgres:
         image: postgres:17-alpine
         volumes:
@@ -44,7 +34,7 @@ services:
                 ipv6_address: 2a01:e0a:5b7:35f1::5432
         restart: always
     caddy:
-        image: caddy-alpine:latest
+        image: caddy:alpine
         volumes:
             - ssl:/ssl:ro
             - /etc/caddy:/etc/caddy
@@ -62,7 +52,7 @@ services:
                 ipv6_address: 2a01:e0a:5b7:35f1::443
                 ipv4_address: 172.20.0.250
     redis:
-        image: redis:alpine
+        image: valkey/valkey
         restart: always
         volumes:
             - /srv/docker/volume/redis/data:/data
@@ -95,10 +85,7 @@ services:
         mem_limit: 128M
         command: /run/powerdns_exporter -api-url http://pdns:8081/api/v1/ -api-key ${API_KEY}
     grafana:
-        image: grafana/grafana:11.4.1
-        environment:
-        - GF_INSTALL_PLUGINS=https://github.com/VictoriaMetrics/victorialogs-datasource/releases/download/v0.4.0/victorialogs-datasource-v0.4.0.zip;victorialogs-datasource
-        - GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=victorialogs-datasource
+        image: grafana/grafana:main
         volumes:
             - /srv/docker/volume/grafana/grafana.ini:/etc/grafana/grafana.ini
         restart: always
@@ -248,12 +235,8 @@ services:
 #        command: minio server /data
 #        mem_limit: 1G
 #        cpus: 0.5
-    matrixsyncv3:
-        image: ghcr.io/matrix-org/sliding-sync:latest
-        env_file: env/matrixsyncv3
-        restart: always
     conduwuit:
-        image: girlbossceo/conduwuit
+        image: ghcr.io/girlbossceo/conduwuit:latest
         env_file: env/conduwuit
         volumes:
             - /srv/docker/volume/conduwuit/config:/config:ro
@@ -262,17 +245,6 @@ services:
         restart: always
         mem_limit: 2G
         cpus: 1
-    dendrite:
-        image: matrixdotorg/dendrite-monolith:main
-        volumes:
-            - /srv/docker/volume/dendrite/dendrite.yaml:/etc/dendrite/dendrite.yaml:ro
-            - /srv/docker/volume/dendrite/cert:/cert:ro
-            - /srv/docker/volume/dendrite/media:/var/dendrite/media
-            - /srv/docker/volume/dendrite/logs:/var/dendrite/logs
-            - /srv/docker/volume/dendrite/jetstream:/var/dendrite/jetstream
-        restart: always
-        mem_limit: 2G
-        cpus: 1
     matrix-alertmanager:
         image: jaywink/matrix-alertmanager:latest
         env_file: env/matrix-alertmanager

From d637d2f6d9bd0be8396011e0f53d1439a2b14d8c Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Thu, 8 May 2025 11:14:24 +0200
Subject: [PATCH 13/23] conduit

---
 peach/docker-compose.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index 4169440..a94c410 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -1,4 +1,6 @@
 volumes:
+    conduit-db:
+        external: true
     conduwuit-db:
         external: true
     ssl:
@@ -235,13 +237,14 @@ services:
 #        command: minio server /data
 #        mem_limit: 1G
 #        cpus: 0.5
-    conduwuit:
-        image: ghcr.io/girlbossceo/conduwuit:latest
-        env_file: env/conduwuit
+    conduit:
+        image: registry.gitlab.com/famedly/conduit/matrix-conduit:latest
+        env_file: env/conduit
         volumes:
-            - /srv/docker/volume/conduwuit/config:/config:ro
-            - /srv/docker/volume/conduwuit/db-backup:/db-backup:rw
-            - conduwuit-db:/db:rw
+            - ssl:/ssl:ro
+            - /srv/docker/volume/conduit/config:/config:ro
+            - /srv/docker/volume/conduit/db-backup:/db-backup:rw
+            - conduit-db:/db:rw
         restart: always
         mem_limit: 2G
         cpus: 1

From 757e37bbe9a304c4bdd8ab1d452d457777d0b129 Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Thu, 8 May 2025 11:25:55 +0200
Subject: [PATCH 14/23] add saic mqtt gw

---
 peach/docker-compose.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index a94c410..d62f5b8 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -248,6 +248,12 @@ services:
         restart: always
         mem_limit: 2G
         cpus: 1
+    saic-mqtt-gateway:
+        image: "saicismartapi/saic-python-mqtt-gateway:latest"
+        container_name: "saic-mqtt-gateway"
+        env_file: env/saic-mqtt-gateway
+        volumes:
+          - /srv/docker/volume/saic/charging-stations.json:/usr/src/app/charging-stations.json
     matrix-alertmanager:
         image: jaywink/matrix-alertmanager:latest
         env_file: env/matrix-alertmanager

From c1d6dc8d6d6fe94ab84342bd5396255bcabfb288 Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Wed, 21 May 2025 10:33:29 +0200
Subject: [PATCH 15/23] remove container name

---
 peach/docker-compose.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index d62f5b8..3d87c3e 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -250,7 +250,6 @@ services:
         cpus: 1
     saic-mqtt-gateway:
         image: "saicismartapi/saic-python-mqtt-gateway:latest"
-        container_name: "saic-mqtt-gateway"
         env_file: env/saic-mqtt-gateway
         volumes:
           - /srv/docker/volume/saic/charging-stations.json:/usr/src/app/charging-stations.json
@@ -333,7 +332,6 @@ services:
           - postgres
         restart: unless-stopped
     ring-mqtt:
-        container_name: ring-mqtt
         restart: unless-stopped
         image: tsightler/ring-mqtt
         ports:

From 553e37e9795bef1a150cbdaaf5e09e74e935581f Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Mon, 18 Aug 2025 23:04:55 +0200
Subject: [PATCH 16/23] upgrade authentik, dnsdist

---
 peach/docker-compose.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index 3d87c3e..1e86c6a 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -196,9 +196,9 @@ services:
         command: -storageDataPath /victoria -retentionPeriod 60 -enableTCP6
         restart: always
         cpus: 1
-        mem_limit: 2048M
+        mem_limit: 8G
     dnsdist:
-        image: dnsdist
+        image: powerdns/dnsdist-20
         volumes:
             - /srv/docker/volume/dnsdist/dnsdist.conf:/etc/dnsdist.conf:ro
             - ssl:/ssl
@@ -260,7 +260,7 @@ services:
         mem_limit: 1G
         cpus: 1
     authentik-server:
-        image: ghcr.io/goauthentik/server:2024.6.0
+        image: ghcr.io/goauthentik/server:2025.6
         restart: unless-stopped
         command: server
         volumes:
@@ -272,7 +272,7 @@ services:
             - postgres
             - redis
     authentik-worker:
-        image: ghcr.io/goauthentik/server:2024.6.0
+        image: ghcr.io/goauthentik/server:2025.6
         restart: unless-stopped
         command: worker
         volumes:
@@ -302,6 +302,8 @@ services:
             - TZ='Europe/Paris'
         volumes:
           - /srv/docker/volume/homeassistant:/config
+        ports:
+          - 9000:9000 # OCPP
         restart: always
     uptime-kuma:
         image: louislam/uptime-kuma

From 6af113e44ecca796fbab03088872c3058aec4394 Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Tue, 7 Oct 2025 15:06:25 +0200
Subject: [PATCH 17/23] dnsdist update

---
 peach/docker-compose.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index 1e86c6a..fef0cd4 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -200,13 +200,12 @@ services:
     dnsdist:
         image: powerdns/dnsdist-20
         volumes:
-            - /srv/docker/volume/dnsdist/dnsdist.conf:/etc/dnsdist.conf:ro
+            - /srv/docker/volume/dnsdist/dnsdist.conf:/etc/dnsdist/dnsdist.conf:ro
             - ssl:/ssl
         restart: always
         mem_limit: 128M
         ports:
             - 853:853
-        command: /usr/bin/dnsdist -u nobody -g nobody -C /etc/dnsdist.conf --supervised -v
         networks:
             default:
                 ipv6_address: 2a01:e0a:5b7:35f1::853

From b9fc5658303a37e5fe279f81fec2ce77852fb886 Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Mon, 27 Oct 2025 22:26:19 +0100
Subject: [PATCH 18/23] upgrade authentik and uptime kuma

---
 peach/docker-compose.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index fef0cd4..5d5dc7d 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -259,7 +259,7 @@ services:
         mem_limit: 1G
         cpus: 1
     authentik-server:
-        image: ghcr.io/goauthentik/server:2025.6
+        image: ghcr.io/goauthentik/server:2025.8
         restart: unless-stopped
         command: server
         volumes:
@@ -271,7 +271,7 @@ services:
             - postgres
             - redis
     authentik-worker:
-        image: ghcr.io/goauthentik/server:2025.6
+        image: ghcr.io/goauthentik/server:2025.8
         restart: unless-stopped
         command: worker
         volumes:
@@ -305,7 +305,7 @@ services:
           - 9000:9000 # OCPP
         restart: always
     uptime-kuma:
-        image: louislam/uptime-kuma
+        image: louislam/uptime-kuma:2
         volumes:
           - /srv/docker/volume/uptime-kuma/data:/app/data:rw
         restart: always

From 9e79cdb930819e9e6a603a55261eee77d19208a4 Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Fri, 5 Dec 2025 22:15:27 +0100
Subject: [PATCH 19/23] new ipv6

---
 peach/docker-compose.yml | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index 5d5dc7d..4f78b85 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -20,8 +20,8 @@ networks:
             config:
                 - subnet: 172.20.0.0/24
                   gateway: 172.20.0.1
-                - subnet: 2a01:e0a:5b7:35f1::/64
-                  gateway: 2a01:e0a:5b7:35f1::1
+                - subnet: 2a01:e0a:cba:5f51::/64
+                  gateway: 2a01:e0a:cba:5f51::1
 
 services:
     postgres:
@@ -33,7 +33,7 @@ services:
             - POSTGRES_PASSWORD=J5PdCv9ObVh5uZCJDpndzXoUumAKn52K
         networks:
             default:
-                ipv6_address: 2a01:e0a:5b7:35f1::5432
+                ipv6_address: 2a01:e0a:cba:5f51::5432
         restart: always
     caddy:
         image: caddy:alpine
@@ -51,7 +51,7 @@ services:
         command: caddy run --config /etc/caddy/Caddyfile --adapter caddyfile
         networks:
             default:
-                ipv6_address: 2a01:e0a:5b7:35f1::443
+                ipv6_address: 2a01:e0a:cba:5f51::443
                 ipv4_address: 172.20.0.250
     redis:
         image: valkey/valkey
@@ -64,7 +64,7 @@ services:
         dns: 192.168.3.2
         networks:
             default:
-                ipv6_address: 2a01:e0a:5b7:35f1::6379
+                ipv6_address: 2a01:e0a:cba:5f51::6379
     pdns:
         image: pdns-auth-49:latest
         volumes:
@@ -78,7 +78,7 @@ services:
         dns: 192.168.3.2
         networks:
             default:
-                ipv6_address: 2a01:e0a:5b7:35f1::53
+                ipv6_address: 2a01:e0a:cba:5f51::53
     pdns-exporter:
         image: debian:bullseye-slim
         volumes:
@@ -101,6 +101,20 @@ services:
         volumes:
             - /srv/www:/srv/www
         restart: always
+    nextcloud-push:
+        image: alpine
+        extra_hosts:
+            - "mail.verry.org:192.168.42.3"
+            - "cloud.verry.org:172.20.0.250"
+        dns: 192.168.3.2
+        command: /srv/www/yann/owncloud/nextcloud/apps/notify_push/bin/x86_64/notify_push /srv/www/yann/owncloud/nextcloud/config/config.php
+        volumes:
+            - /srv/www/yann/owncloud/nextcloud:/srv/www/yann/owncloud/nextcloud
+        restart: always
+        networks:
+            default:
+                ipv6_address: 2a01:e0a:cba:5f51::beef
+                ipv4_address: 172.20.0.251
     miniflux:
         image: miniflux/miniflux:latest-distroless
         env_file: env/miniflux
@@ -134,10 +148,10 @@ services:
             - "quichante.vpn6:fd00::42:4"
             - "click.vpn6:fd00::42:6"
             - "quizz.vpn6:fd00::42:8"
-            - "kiwi.verry.org:2a01:e0a:5b7:35f3::6"
-            - "banana.verry.org:2a01:e0a:5b7:35f3::11"
+            - "kiwi.verry.org:2a01:e0a:cba:5f53::6"
+            - "banana.verry.org:2a01:e0a:cba:5f53::11"
             - "backup-01.dinoutoo.vpn:192.168.42.9"
-            - "home.verry.org:2a01:e0a:5b7:35f1::443"
+            - "home.verry.org:2a01:e0a:cba:5f51::443"
             - "mail.verry.org:192.168.3.5"
         command: -enableTCP6 -promscrape.config=/prometheus.yml -remoteWrite.url=http://victoria:8428/api/v1/write -sortLabels -promscrape.config.strictParse=false
         restart: always
@@ -208,7 +222,7 @@ services:
             - 853:853
         networks:
             default:
-                ipv6_address: 2a01:e0a:5b7:35f1::853
+                ipv6_address: 2a01:e0a:cba:5f51::853
     gitea:
         image: codeberg.org/forgejo/forgejo:10
         volumes:
@@ -259,7 +273,7 @@ services:
         mem_limit: 1G
         cpus: 1
     authentik-server:
-        image: ghcr.io/goauthentik/server:2025.8
+        image: ghcr.io/goauthentik/server:2025.10
         restart: unless-stopped
         command: server
         volumes:
@@ -271,7 +285,7 @@ services:
             - postgres
             - redis
     authentik-worker:
-        image: ghcr.io/goauthentik/server:2025.8
+        image: ghcr.io/goauthentik/server:2025.10
         restart: unless-stopped
         command: worker
         volumes:
@@ -294,7 +308,7 @@ services:
         restart: always
         networks:
             default:
-                ipv6_address: 2a01:e0a:5b7:35f1::1883
+                ipv6_address: 2a01:e0a:cba:5f51::1883
     homeassistant:
         image: ghcr.io/home-assistant/home-assistant:stable
         environment:

From 797bed4edd0f36ae6ac4e055f480edd215c01b80 Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Tue, 6 Jan 2026 17:16:53 +0100
Subject: [PATCH 20/23] switch pdns to lmdb and more official image

---
 peach/docker-compose.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index 4f78b85..191238a 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -66,13 +66,15 @@ services:
             default:
                 ipv6_address: 2a01:e0a:cba:5f51::6379
     pdns:
-        image: pdns-auth-49:latest
+        image: powerdns/pdns-auth-50:latest
         volumes:
-            - /srv/docker/volume/pdns.conf:/etc/pdns/pdns.conf:ro
+            - /srv/docker/volume/powerdns/pdns/pdns.conf:/etc/powerdns/pdns.conf:ro
+            - /srv/docker/volume/powerdns/pdns/custom.conf:/etc/powerdns/pdns.d/custom.conf:ro
+            - /srv/docker/volume/powerdns/pdns/data:/powerdns-lmdb:rw
         ports:
             - "192.168.3.10:53:53/udp"
             - "192.168.3.10:53:53/tcp"
-        command: /usr/sbin/pdns_server --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no
+        #command: /usr/sbin/pdns_server --guardian=no --daemon=no --disable-syslog --log-timestamp=no --write-pid=no
         restart: always
         mem_limit: 128M
         dns: 192.168.3.2
@@ -196,6 +198,12 @@ services:
         command: '/hue_exporter/hue_exporter -metrics-file=/hue_exporter/hue_metrics.json  -hue-url="192.168.0.3" -username="qR4H-LSFFPuMz607ALjz56GF9qE4mmmsx4qrmD7Q" -listen-address=0.0.0.0:9773'
         restart: always
         mem_limit: 128M
+    secret:
+        image: ghcr.io/openbao/openbao
+        restart: always
+        mem_limit: 128M
+        volumes:
+            - /srv/docker/volume/openbao:/openbao
     promtail:
         image: grafana/promtail
         command: -config.file=/etc/promtail/promtail.yaml

From 4070583bcac357451644d919df8e3b0cd16c642a Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Mon, 25 May 2026 16:02:45 +0200
Subject: [PATCH 21/23] update may 2026

---
 peach/docker-compose.yml | 68 +++++++++++++++++++++++-----------------
 1 file changed, 39 insertions(+), 29 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index 191238a..33abdb5 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -9,6 +9,10 @@ volumes:
         external: true
     postgres-17:
         external: true
+    mysql-data:
+        external: true
+    lumieredesoy-ghost-data:
+        external: true
 
 networks:
     default:
@@ -81,13 +85,6 @@ services:
         networks:
             default:
                 ipv6_address: 2a01:e0a:cba:5f51::53
-    pdns-exporter:
-        image: debian:bullseye-slim
-        volumes:
-            - /srv/docker/volume/prometheus/powerdns_exporter/powerdns_exporter:/run/powerdns_exporter:ro
-        restart: always
-        mem_limit: 128M
-        command: /run/powerdns_exporter -api-url http://pdns:8081/api/v1/ -api-key ${API_KEY}
     grafana:
         image: grafana/grafana:main
         volumes:
@@ -95,7 +92,7 @@ services:
         restart: always
         mem_limit: 1G
     php:
-        image: php83-alpine
+        image: php85-alpine
         extra_hosts:
             - "mail.verry.org:192.168.42.3"
         dns: 192.168.3.2
@@ -198,12 +195,12 @@ services:
         command: '/hue_exporter/hue_exporter -metrics-file=/hue_exporter/hue_metrics.json  -hue-url="192.168.0.3" -username="qR4H-LSFFPuMz607ALjz56GF9qE4mmmsx4qrmD7Q" -listen-address=0.0.0.0:9773'
         restart: always
         mem_limit: 128M
-    secret:
-        image: ghcr.io/openbao/openbao
-        restart: always
-        mem_limit: 128M
-        volumes:
-            - /srv/docker/volume/openbao:/openbao
+#    secret:
+#        image: ghcr.io/openbao/openbao
+#        restart: always
+#        mem_limit: 128M
+#        volumes:
+#            - /srv/docker/volume/openbao:/openbao
     promtail:
         image: grafana/promtail
         command: -config.file=/etc/promtail/promtail.yaml
@@ -219,20 +216,20 @@ services:
         restart: always
         cpus: 1
         mem_limit: 8G
-    dnsdist:
-        image: powerdns/dnsdist-20
-        volumes:
-            - /srv/docker/volume/dnsdist/dnsdist.conf:/etc/dnsdist/dnsdist.conf:ro
-            - ssl:/ssl
-        restart: always
-        mem_limit: 128M
-        ports:
-            - 853:853
-        networks:
-            default:
-                ipv6_address: 2a01:e0a:cba:5f51::853
+#    dnsdist:
+#        image: powerdns/dnsdist-20
+#        volumes:
+#            - /srv/docker/volume/dnsdist/dnsdist.conf:/etc/dnsdist/dnsdist.conf:ro
+#            - ssl:/ssl
+#        restart: always
+#        mem_limit: 128M
+#        ports:
+#            - 853:853
+#        networks:
+#            default:
+#                ipv6_address: 2a01:e0a:cba:5f51::853
     gitea:
-        image: codeberg.org/forgejo/forgejo:10
+        image: codeberg.org/forgejo/forgejo:11
         volumes:
             - /srv/docker/volume/gitea/data:/data
         restart: always
@@ -281,7 +278,7 @@ services:
         mem_limit: 1G
         cpus: 1
     authentik-server:
-        image: ghcr.io/goauthentik/server:2025.10
+        image: ghcr.io/goauthentik/server:2026.5
         restart: unless-stopped
         command: server
         volumes:
@@ -293,7 +290,7 @@ services:
             - postgres
             - redis
     authentik-worker:
-        image: ghcr.io/goauthentik/server:2025.10
+        image: ghcr.io/goauthentik/server:2026.5
         restart: unless-stopped
         command: worker
         volumes:
@@ -365,3 +362,16 @@ services:
           options:
             max-size: 10m
             max-file: "3"
+    mysql:
+        image: mysql:lts
+        volumes:
+            - mysql-data:/var/lib/mysql
+            - ssl:/ssl:ro
+        restart: always
+    lumieredesoy-ghost:
+        image: ghost:6-alpine
+        volumes:
+            - lumieredesoy-ghost-data:/var/lib/ghost/content
+            - /srv/docker/volume/lumieredesoy_ghost/config/config.production.json:/var/lib/ghost/config.production.json:ro
+        env_file: env/lumieredesoy-ghost
+        restart: always

From 288505f6fed945165c40969f0da39045e01730b5 Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Fri, 28 Aug 2026 21:43:50 +0200
Subject: [PATCH 22/23] remove minio to garage, pdns51

---
 peach/docker-compose.yml | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index 33abdb5..af4bd59 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -70,7 +70,7 @@ services:
             default:
                 ipv6_address: 2a01:e0a:cba:5f51::6379
     pdns:
-        image: powerdns/pdns-auth-50:latest
+        image: powerdns/pdns-auth-51:latest
         volumes:
             - /srv/docker/volume/powerdns/pdns/pdns.conf:/etc/powerdns/pdns.conf:ro
             - /srv/docker/volume/powerdns/pdns/custom.conf:/etc/powerdns/pdns.d/custom.conf:ro
@@ -236,25 +236,6 @@ services:
         mem_limit: 512M
         depends_on:
             - postgres
-    routeros-exporter:
-        image: python-routeros
-        restart: always
-        mem_limit: 128M
-        env_file: env/routeros-exporter
-    whoami:
-        image: traefik/whoami
-        restart: always
-        environment:
-            - WHOAMI_NAME=iamverry
-#    minio:
-#        image: minio/minio
-#        volumes:
-#            - /srv/docker/volume/minio/data:/data:rw
-#        env_file: env/minio
-#        restart: always
-#        command: minio server /data
-#        mem_limit: 1G
-#        cpus: 0.5
     conduit:
         image: registry.gitlab.com/famedly/conduit/matrix-conduit:latest
         env_file: env/conduit
@@ -362,6 +343,16 @@ services:
           options:
             max-size: 10m
             max-file: "3"
+    garage:
+        hostname: peach-garage
+        image: dxflrs/garage:v2.3.0
+        volumes:
+            - /srv/docker/volume/garage/data:/var/lib/garage
+            - /srv/docker/volume/garage/garage.toml:/etc/garage.toml:ro
+        networks:
+            default:
+                ipv6_address: 2a01:e0a:cba:5f51::666
+        restart: always
     mysql:
         image: mysql:lts
         volumes:

From fb825b117128464919d36229c9632681c6ae126c Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Wed, 7 Oct 2026 22:36:56 +0200
Subject: [PATCH 23/23] tuwunel

---
 peach/docker-compose.yml | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index af4bd59..067c56b 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -236,13 +236,13 @@ services:
         mem_limit: 512M
         depends_on:
             - postgres
-    conduit:
-        image: registry.gitlab.com/famedly/conduit/matrix-conduit:latest
-        env_file: env/conduit
+    tuwunel:
+        image: ghcr.io/matrix-construct/tuwunel:latest
+        env_file: env/tuwunel
         volumes:
             - ssl:/ssl:ro
-            - /srv/docker/volume/conduit/config:/config:ro
-            - /srv/docker/volume/conduit/db-backup:/db-backup:rw
+            - /srv/docker/volume/tuwunel/config:/config:ro
+            - /srv/docker/volume/tuwunel/db-backup:/db-backup:rw
             - conduit-db:/db:rw
         restart: always
         mem_limit: 2G
@@ -259,7 +259,7 @@ services:
         mem_limit: 1G
         cpus: 1
     authentik-server:
-        image: ghcr.io/goauthentik/server:2026.5
+        image: ghcr.io/goauthentik/server:2026.8
         restart: unless-stopped
         command: server
         volumes:
@@ -271,7 +271,7 @@ services:
             - postgres
             - redis
     authentik-worker:
-        image: ghcr.io/goauthentik/server:2026.5
+        image: ghcr.io/goauthentik/server:2026.8
         restart: unless-stopped
         command: worker
         volumes:
@@ -343,9 +343,14 @@ services:
           options:
             max-size: 10m
             max-file: "3"
+    whoami:
+       image: traefik/whoami
+       restart: always
+       environment:
+            - WHOAMI_NAME=iamverry
     garage:
         hostname: peach-garage
-        image: dxflrs/garage:v2.3.0
+        image: dxflrs/garage:v2.4.1
         volumes:
             - /srv/docker/volume/garage/data:/var/lib/garage
             - /srv/docker/volume/garage/garage.toml:/etc/garage.toml:ro