peach/docker-compose.yml

@@ -9,12 +9,8 @@ volumes:
         external: true
     victoria-metrics:
         external: true
-    haproxy-socket:
-        external: true
     postgres-13:
         external: true
-    postgres-15:
-        external: true
 
 networks:
     default:
@@ -40,13 +36,11 @@ services:
             - 389:389
         restart: always
     postgres:
-        image: postgres:15-alpine
+        image: postgres:13-alpine
         volumes:
-            - postgres-15:/var/lib/postgresql/data
+            - postgres-13:/var/lib/postgresql/data
             - ssl:/ssl:ro
         dns: fd00::3:2
-        environment:
-            - POSTGRES_PASSWORD=J5PdCv9ObVh5uZCJDpndzXoUumAKn52K
         networks:
             default:
                 ipv6_address: 2a01:e0a:5b7:35f1::5432
@@ -57,7 +51,6 @@ services:
             - ssl:/ssl:ro
             - /etc/haproxy:/usr/local/etc/haproxy:ro
             - /etc/haproxy:/etc/haproxy:ro
-            - haproxy-socket:/var/lib/haproxy:rw
         ports:
             - 443:443
             - 443:443/udp
@@ -68,16 +61,6 @@ services:
         networks:
             default:
                 ipv6_address: 2a01:e0a:5b7:35f1::443
-    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:
@@ -141,7 +124,7 @@ services:
     grafana:
         image: grafana/grafana
         volumes:
-            - /srv/docker/volume/grafana/grafana.ini:/etc/grafana/grafana.ini
+            - /srv/docker/volume/grafana.ini:/etc/grafana/grafana.ini
         restart: always
         mem_limit: 128M
     loki:
@@ -156,39 +139,18 @@ services:
         env_file: env/miniflux
         restart: always
         mem_limit: 128M
-    php:
+    php80:
         image: php-alpine
         extra_hosts:
-            - "mail.verry.org:192.168.42.3"
+            - "mail.verry.org:192.168.3.5"
-        dns: 192.168.3.2
         volumes:
             - /srv/www:/srv/www
         restart: always
-    authentik-server:
+        dns: 192.168.3.2
-        image: ghcr.io/goauthentik/server:latest
-        restart: unless-stopped
-        command: server
-        volumes:
-          - /srv/docker/volume/authentik/media:/media
-          - /srv/docker/volume/authentik/custom-templates:/templates
-        env_file:
-          - env/authentik
-    authentik-worker:
-        image: ghcr.io/goauthentik/server:latest
-        restart: unless-stopped
-        command: worker
-        volumes:
-          - /srv/docker/volume/authentik/certs:/certs
-          - /srv/docker/volume/authentik/media:/media
-          - /srv/docker/volume/authentik/custom-templates:/templates
-        restart: unless-stopped
-        env_file:
-          - env/authentik
     pgbouncer:
         image: pgbouncer-alpine
         volumes:
             - /srv/docker/volume/pgbouncer:/etc/pgbouncer:ro
-        dns: 192.168.3.2
         restart: always
         mem_limit: 128M
     vmalert:
@@ -208,7 +170,7 @@ services:
             - "ns2.vpn6:fd00::42:2"
             - "ns3.vpn6:fd00::42:3"
             - "backup-01.dinoutoo.vpn6:fd00::42:9"
-            - "unbound-exporter:192.168.3.2"
+            - "unbound-exporter:fd00::3:2"
             - "quichante.vpn6:fd00::42:4"
             - "click.vpn6:fd00::42:6"
             - "quizz.vpn6:fd00::42:8"
@@ -223,15 +185,10 @@ services:
         image: prom/alertmanager
         volumes:
             - /srv/docker/volume/prometheus/config/alertmanager.yml:/etc/alertmanager/alertmanager.yml:ro
-            - /srv/docker/volume/alertmanager/data:/alertmanager:rw
         extra_hosts:
             - "mail.verry.org:192.168.3.5"
         restart: always
         mem_limit: 128M
-        command:
-          - "--config.file=/etc/alertmanager/alertmanager.yml"
-          - "--storage.path=/alertmanager"
-          - "--web.external-url=https://alertmanager.verry.org/"
     prometheus-blackbox:
         image: prom/blackbox-exporter
         volumes:
@@ -258,10 +215,9 @@ services:
         restart: always
         mem_limit: 128M
     prometheus-hue:
-        image: alpine
+        image: mitchellrj/hue_exporter:latest
         volumes:
-            - /srv/docker/volume/hue_exporter:/hue_exporter:ro
+            - /srv/docker/volume/hue_exporter/home.yml:/etc/hue_exporter/config.yml:ro
-        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
     promtail:
@@ -354,41 +310,18 @@ services:
             - /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: 1G
         cpus: 0.5
-    matrix-alertmanager:
+    coraza-spoa:
-        image: jaywink/matrix-alertmanager:latest
+        image: alpine
-        env_file: env/matrix-alertmanager
-        restart: always
-        mem_limit: 1G
-        cpus: 0.5
-    uptime-kuma:
-        image: louislam/uptime-kuma
         volumes:
-          - /srv/docker/volume/uptime-kuma/data:/app/data:rw
+            - /srv/docker/volume/coraza-spoa/bin/coraza-spoa_amd64:/coraza-spoa:ro
+            - /srv/docker/volume/coraza-spoa/config:/etc/coraza-spoa:ro
+        command: /coraza-spoa -config-file /etc/coraza-spoa/config.yml
         restart: always
         mem_limit: 1G
         cpus: 0.5
-    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
-        networks:
-            default:
-                ipv4_address: 172.20.0.42
     geoipupdate:
         image: "maxmindinc/geoipupdate:latest"
         volumes:

peach/update.sh

@@ -6,6 +6,3 @@ cd "$(dirname "$0")"
 docker-compose pull --ignore-pull-failures
 # reload if needed
 docker-compose up -d
-
-# upgrade miniflux
-#./upgrade_miniflux.sh