From 7a67515e7899e483808a977128cfbacfbf76854d Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Fri, 7 Jun 2024 11:52:02 +0200
Subject: [PATCH 1/2] june updates, caddy power

---
 peach/docker-compose.yml | 40 ++++++++++++++++------------------------
 peach/reload.sh          |  2 +-
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index 99432af..f2db9ee 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -1,5 +1,3 @@
-version: "3.9"
-
 volumes:
     ssl:
         external: true
@@ -54,16 +52,12 @@ services:
             - /etc/haproxy:/usr/local/etc/haproxy:ro
             - /etc/haproxy:/etc/haproxy:ro
             - haproxy-socket:/var/lib/haproxy:rw
-        ports:
-            - 443:443
-            - 443:443/udp
-            - 80:80
         restart: always
         mem_limit: 512M
         dns: fd00::3:2
         networks:
             default:
-                ipv6_address: 2a01:e0a:5b7:35f1::443
+                ipv6_address: 2a01:e0a:5b7:35f1::445
     vault:
         image: hashicorp/vault
         volumes:
@@ -75,15 +69,22 @@ services:
           - IPC_LOCK
         command: vault server -config /vault/config
     caddy:
-        image: caddy:alpine
+        image: caddy-alpine
         volumes:
             - ssl:/etc/dehydrated:ro
             - /etc/caddy:/etc/caddy
             - /srv/www:/srv/www
             - /srv/www/nfs/kiwi/Videos:/srv/www/nfs/kiwi/Videos:ro
         restart: always
+        ports:
+            - 443:443
+            - 443:443/udp
+            - 80:80
         mem_limit: 128M
-        dns: 192.168.3.2
+        command: caddy run --config /etc/caddy/Caddyfile --adapter caddyfile
+        networks:
+            default:
+                ipv6_address: 2a01:e0a:5b7:35f1::443
     redis:
         image: redis:alpine
         restart: always
@@ -261,7 +262,7 @@ services:
             default:
                 ipv6_address: 2a01:e0a:5b7:35f1::853
     gitea:
-        image: gitea/gitea:dev
+        image: codeberg.org/forgejo/forgejo:7
         volumes:
             - /srv/docker/volume/gitea/data:/data
         restart: always
@@ -336,20 +337,11 @@ services:
         restart: always
         mem_limit: 2G
         cpus: 1
-    vikunja-api:
-        image: vikunja/api:latest
-        env_file: env/vikunja-api
-        volumes:
-          - /srv/docker/volume/vikunja/api/files:/app/vikunja/files:rw
-        restart: always
-        mem_limit: 1G
-        cpus: 0.5
-    vikunja-frontend:
-        image: vikunja/frontend
-        env_file: env/vikunja-frontend
-        restart: always
-        mem_limit: 512M
-        cpus: 0.5
+    openspeedtest:
+        environment:
+          - ENABLE_LETSENCRYPT=False
+          - DOMAIN_NAME=speedtest.verry.org
+        image: "openspeedtest/latest"
     geoipupdate:
         image: "maxmindinc/geoipupdate:latest"
         volumes:
diff --git a/peach/reload.sh b/peach/reload.sh
index f4c25ff..e38915e 100755
--- a/peach/reload.sh
+++ b/peach/reload.sh
@@ -3,5 +3,5 @@
 
 cd "$(dirname "$0")"
 
-docker-compose pull --ignore-pull-failures
+#docker-compose pull --ignore-pull-failures
 docker-compose up -d

From c6314c516d5f7d6c8372fc559771b78bd4cacac8 Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Fri, 7 Jun 2024 11:54:53 +0200
Subject: [PATCH 2/2] cpu to 1, clean legacy

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

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index f2db9ee..21484b3 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -3,10 +3,6 @@ volumes:
         external: true
     victoria-metrics:
         external: true
-    haproxy-socket:
-        external: true
-    postgres-13:
-        external: true
     postgres-15:
         external: true
 
@@ -45,19 +41,6 @@ services:
             default:
                 ipv6_address: 2a01:e0a:5b7:35f1::5432
         restart: always
-    haproxy:
-        image: haproxytech/haproxy-alpine-quic:2.8
-        volumes:
-            - ssl:/ssl:rw
-            - /etc/haproxy:/usr/local/etc/haproxy:ro
-            - /etc/haproxy:/etc/haproxy:ro
-            - haproxy-socket:/var/lib/haproxy:rw
-        restart: always
-        mem_limit: 512M
-        dns: fd00::3:2
-        networks:
-            default:
-                ipv6_address: 2a01:e0a:5b7:35f1::445
     vault:
         image: hashicorp/vault
         volumes:
@@ -312,7 +295,7 @@ services:
         restart: always
         command: /bin/syncv3
         mem_limit: 1G
-        cpus: 0.5
+        cpus: 1
     dendrite:
         image: matrixdotorg/dendrite-monolith:latest
         volumes:
@@ -323,13 +306,13 @@ services:
             - /srv/docker/volume/dendrite/jetstream:/var/dendrite/jetstream
         restart: always
         mem_limit: 1G
-        cpus: 0.5
+        cpus: 1
     matrix-alertmanager:
         image: jaywink/matrix-alertmanager:latest
         env_file: env/matrix-alertmanager
         restart: always
         mem_limit: 1G
-        cpus: 0.5
+        cpus: 1
     uptime-kuma:
         image: louislam/uptime-kuma
         volumes: