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] 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