From f916f2316e59663e7952391c371b9ea165d53edb Mon Sep 17 00:00:00 2001 From: Yann Verry Date: Wed, 9 Nov 2022 16:50:13 +0100 Subject: [PATCH 1/6] add vikunja --- peach/docker-compose.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml index f2b0f07..644b0c0 100644 --- a/peach/docker-compose.yml +++ b/peach/docker-compose.yml @@ -310,9 +310,28 @@ 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 + 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: 1G + cpus: 0.5 + networks: + default: + ipv4_address: 172.20.0.42 coraza-spoa: image: alpine volumes: From 89305a7be12cc812d381f25e1e1335fa2aef8c8a Mon Sep 17 00:00:00 2001 From: Yann Verry Date: Thu, 17 Nov 2022 21:28:15 +0100 Subject: [PATCH 2/6] add upgrade miniflux --- peach/update.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/peach/update.sh b/peach/update.sh index 1a033ed..8f21d4e 100755 --- a/peach/update.sh +++ b/peach/update.sh @@ -6,3 +6,6 @@ cd "$(dirname "$0")" docker-compose pull --ignore-pull-failures # reload if needed docker-compose up -d + +# upgrade miniflux +./upgrade_miniflux.sh From 76b667529d98055f9ff08a7b27a5e726be1656da Mon Sep 17 00:00:00 2001 From: Yann Verry Date: Thu, 17 Nov 2022 21:56:21 +0100 Subject: [PATCH 3/6] add matrix notification --- peach/docker-compose.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml index 644b0c0..1458837 100644 --- a/peach/docker-compose.yml +++ b/peach/docker-compose.yml @@ -315,6 +315,12 @@ services: restart: always mem_limit: 1G cpus: 0.5 + matrix-alertmanager: + image: jaywink/matrix-alertmanager:latest + env_file: env/matrix-alertmanager + restart: always + mem_limit: 1G + cpus: 0.5 vikunja-api: image: vikunja/api:latest env_file: env/vikunja-api From e1cd1b08cff3920923efe9365015b3cb3a8f0fb3 Mon Sep 17 00:00:00 2001 From: Yann Verry Date: Sat, 19 Nov 2022 18:19:02 +0100 Subject: [PATCH 4/6] update alertmanager --- peach/docker-compose.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml index 1458837..5a128a4 100644 --- a/peach/docker-compose.yml +++ b/peach/docker-compose.yml @@ -185,10 +185,15 @@ 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: @@ -338,15 +343,6 @@ services: networks: default: ipv4_address: 172.20.0.42 - coraza-spoa: - image: alpine - volumes: - - /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 geoipupdate: image: "maxmindinc/geoipupdate:latest" volumes: From d9e2b171e13cf278dd8994a03332a9fbc3d68e0f Mon Sep 17 00:00:00 2001 From: Yann Verry Date: Fri, 30 Dec 2022 18:19:42 +0100 Subject: [PATCH 5/6] fix hue problem --- peach/docker-compose.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml index 5a128a4..e0c93c7 100644 --- a/peach/docker-compose.yml +++ b/peach/docker-compose.yml @@ -220,9 +220,10 @@ services: restart: always mem_limit: 128M prometheus-hue: - image: mitchellrj/hue_exporter:latest + image: alpine volumes: - - /srv/docker/volume/hue_exporter/home.yml:/etc/hue_exporter/config.yml:ro + - /srv/docker/volume/hue_exporter:/hue_exporter: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: From abf4eb0876ab1f5a1ec9f6761417277e4219d9b2 Mon Sep 17 00:00:00 2001 From: Yann Verry Date: Wed, 22 Mar 2023 22:53:30 +0100 Subject: [PATCH 6/6] 20230322 --- peach/docker-compose.yml | 61 ++++++++++++++++++++++++++++++++++------ peach/update.sh | 2 +- 2 files changed, 54 insertions(+), 9 deletions(-) diff --git a/peach/docker-compose.yml b/peach/docker-compose.yml index e0c93c7..1a8eb29 100644 --- a/peach/docker-compose.yml +++ b/peach/docker-compose.yml @@ -9,8 +9,12 @@ volumes: external: true victoria-metrics: external: true + haproxy-socket: + external: true postgres-13: external: true + postgres-15: + external: true networks: default: @@ -36,11 +40,13 @@ services: - 389:389 restart: always postgres: - image: postgres:13-alpine + image: postgres:15-alpine volumes: - - postgres-13:/var/lib/postgresql/data + - postgres-15:/var/lib/postgresql/data - ssl:/ssl:ro dns: fd00::3:2 + environment: + - POSTGRES_PASSWORD=J5PdCv9ObVh5uZCJDpndzXoUumAKn52K networks: default: ipv6_address: 2a01:e0a:5b7:35f1::5432 @@ -51,6 +57,7 @@ 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 @@ -61,6 +68,16 @@ 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: @@ -124,7 +141,7 @@ services: grafana: image: grafana/grafana volumes: - - /srv/docker/volume/grafana.ini:/etc/grafana/grafana.ini + - /srv/docker/volume/grafana/grafana.ini:/etc/grafana/grafana.ini restart: always mem_limit: 128M loki: @@ -139,18 +156,39 @@ services: env_file: env/miniflux restart: always mem_limit: 128M - php80: + php: image: php-alpine extra_hosts: - - "mail.verry.org:192.168.3.5" + - "mail.verry.org:192.168.42.3" + dns: 192.168.3.2 volumes: - /srv/www:/srv/www restart: always - dns: 192.168.3.2 + authentik-server: + 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: @@ -170,7 +208,7 @@ services: - "ns2.vpn6:fd00::42:2" - "ns3.vpn6:fd00::42:3" - "backup-01.dinoutoo.vpn6:fd00::42:9" - - "unbound-exporter:fd00::3:2" + - "unbound-exporter:192.168.3.2" - "quichante.vpn6:fd00::42:4" - "click.vpn6:fd00::42:6" - "quizz.vpn6:fd00::42:8" @@ -327,6 +365,13 @@ services: restart: always mem_limit: 1G cpus: 0.5 + uptime-kuma: + image: louislam/uptime-kuma + volumes: + - /srv/docker/volume/uptime-kuma/data:/app/data:rw + restart: always + mem_limit: 1G + cpus: 0.5 vikunja-api: image: vikunja/api:latest env_file: env/vikunja-api @@ -339,7 +384,7 @@ services: image: vikunja/frontend env_file: env/vikunja-frontend restart: always - mem_limit: 1G + mem_limit: 512M cpus: 0.5 networks: default: diff --git a/peach/update.sh b/peach/update.sh index 8f21d4e..d1ebd5d 100755 --- a/peach/update.sh +++ b/peach/update.sh @@ -8,4 +8,4 @@ docker-compose pull --ignore-pull-failures docker-compose up -d # upgrade miniflux -./upgrade_miniflux.sh +#./upgrade_miniflux.sh