From 606e96b9efc0c5e6a51011e00fab4f6de7d01691 Mon Sep 17 00:00:00 2001
From: Yann Verry <yann@verry.org>
Date: Sun, 25 Sep 2022 22:46:03 +0200
Subject: [PATCH] update ipv6 subnet and VM retention

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

diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml
index 13bde23..1506f2b 100644
--- a/peach/docker-compose.yml
+++ b/peach/docker-compose.yml
@@ -22,8 +22,8 @@ networks:
             config:
                 - subnet: 172.20.0.0/24
                   gateway: 172.20.0.1
-                - subnet: 2a01:e0a:49e:2b81::/64
-                  gateway: 2a01:e0a:49e:2b81::1
+                - subnet: 2a01:e0a:5b7:35f1::/64
+                  gateway: 2a01:e0a:5b7:35f1::1
 
 services:
     openldap:
@@ -43,7 +43,7 @@ services:
         dns: fd00::3:2
         networks:
             default:
-                ipv6_address: 2a01:e0a:49e:2b81::5432
+                ipv6_address: 2a01:e0a:5b7:35f1::5432
         restart: always
     haproxy:
         image: haproxy:alpine
@@ -59,7 +59,7 @@ services:
         dns: fd00::3:2
         networks:
             default:
-                ipv6_address: 2a01:e0a:49e:2b81::8443
+                ipv6_address: 2a01:e0a:5b7:35f1::8443
     caddy:
         image: caddy:alpine
         volumes:
@@ -75,7 +75,7 @@ services:
         dns: 192.168.3.2
         networks:
             default:
-                ipv6_address: 2a01:e0a:49e:2b81::443
+                ipv6_address: 2a01:e0a:5b7:35f1::443
     redis:
         image: redis:alpine
         restart: always
@@ -87,7 +87,7 @@ services:
         dns: 192.168.3.2
         networks:
             default:
-                ipv6_address: 2a01:e0a:49e:2b81::6379
+                ipv6_address: 2a01:e0a:5b7:35f1::6379
     mariadb:
         image: mariadb
         volumes:
@@ -98,7 +98,7 @@ services:
         dns: 192.168.3.2
         networks:
             default:
-                ipv6_address: 2a01:e0a:49e:2b81::3306
+                ipv6_address: 2a01:e0a:5b7:35f1::3306
         restart: always
     lumieredesoy-ghost:
         image: ghost:5-alpine
@@ -119,7 +119,7 @@ services:
         dns: 192.168.3.2
         networks:
             default:
-                ipv6_address: 2a01:e0a:49e:2b81::53
+                ipv6_address: 2a01:e0a:5b7:35f1::53
     pdns-exporter:
         image: debian:bullseye-slim
         volumes:
@@ -173,9 +173,9 @@ services:
             - "quichante.vpn6:fd00::42:4"
             - "click.vpn6:fd00::42:6"
             - "quizz.vpn6:fd00::42:8"
-            - "kiwi.verry.org:2a01:e0a:49e:2b83::6"
+            - "kiwi.verry.org:2a01:e0a:5b7:35f3::6"
             - "backup-01.dinoutoo.vpn:192.168.42.9"
-            - "home.verry.org:2a01:e0a:49e:2b81::443"
+            - "home.verry.org:2a01:e0a:5b7:35f1::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
@@ -239,7 +239,7 @@ services:
         mem_limit: 128M
         networks:
             default:
-                ipv6_address: 2a01:e0a:49e:2b81::514
+                ipv6_address: 2a01:e0a:5b7:35f1::514
     linky-exporter:
         userns_mode: "host"
         image: debian:bullseye-slim
@@ -254,8 +254,10 @@ services:
         image: victoriametrics/victoria-metrics
         volumes:
             - victoria-metrics:/victoria
-        command: -storageDataPath /victoria -retentionPeriod 36 -enableTCP6
+        command: -storageDataPath /victoria -retentionPeriod 60 -enableTCP6
         restart: always
+        cpus: 1
+        mem_limit: 2048M
     dnsdist:
         image: dnsdist
         volumes:
@@ -268,7 +270,7 @@ services:
         command: /usr/bin/dnsdist -u nobody -g nobody -C /etc/dnsdist.conf --supervised -v
         networks:
             default:
-                ipv6_address: 2a01:e0a:49e:2b81::853
+                ipv6_address: 2a01:e0a:5b7:35f1::853
     gitea:
         image: gitea/gitea:dev
         volumes: