Compare commits

..

No commits in common. "606e96b9efc0c5e6a51011e00fab4f6de7d01691" and "ae24393275d359bea81165c83b04faf61e91fe60" have entirely different histories.

View file

@ -5,6 +5,8 @@ volumes:
external: true external: true
mariadb-data: mariadb-data:
external: true external: true
ghost-data:
external: true
lumieredesoy-ghost-data: lumieredesoy-ghost-data:
external: true external: true
victoria-metrics: victoria-metrics:
@ -22,8 +24,8 @@ networks:
config: config:
- subnet: 172.20.0.0/24 - subnet: 172.20.0.0/24
gateway: 172.20.0.1 gateway: 172.20.0.1
- subnet: 2a01:e0a:5b7:35f1::/64 - subnet: 2a01:e0a:49e:2b81::/64
gateway: 2a01:e0a:5b7:35f1::1 gateway: 2a01:e0a:49e:2b81::1
services: services:
openldap: openldap:
@ -43,7 +45,7 @@ services:
dns: fd00::3:2 dns: fd00::3:2
networks: networks:
default: default:
ipv6_address: 2a01:e0a:5b7:35f1::5432 ipv6_address: 2a01:e0a:49e:2b81::5432
restart: always restart: always
haproxy: haproxy:
image: haproxy:alpine image: haproxy:alpine
@ -59,7 +61,7 @@ services:
dns: fd00::3:2 dns: fd00::3:2
networks: networks:
default: default:
ipv6_address: 2a01:e0a:5b7:35f1::8443 ipv6_address: 2a01:e0a:49e:2b81::8443
caddy: caddy:
image: caddy:alpine image: caddy:alpine
volumes: volumes:
@ -75,7 +77,7 @@ services:
dns: 192.168.3.2 dns: 192.168.3.2
networks: networks:
default: default:
ipv6_address: 2a01:e0a:5b7:35f1::443 ipv6_address: 2a01:e0a:49e:2b81::443
redis: redis:
image: redis:alpine image: redis:alpine
restart: always restart: always
@ -87,7 +89,7 @@ services:
dns: 192.168.3.2 dns: 192.168.3.2
networks: networks:
default: default:
ipv6_address: 2a01:e0a:5b7:35f1::6379 ipv6_address: 2a01:e0a:49e:2b81::6379
mariadb: mariadb:
image: mariadb image: mariadb
volumes: volumes:
@ -98,15 +100,23 @@ services:
dns: 192.168.3.2 dns: 192.168.3.2
networks: networks:
default: default:
ipv6_address: 2a01:e0a:5b7:35f1::3306 ipv6_address: 2a01:e0a:49e:2b81::3306
restart: always restart: always
lumieredesoy-ghost: lumieredesoy-ghost:
image: ghost:5-alpine image: ghost:4-alpine
volumes: volumes:
- lumieredesoy-ghost-data:/var/lib/ghost/content - lumieredesoy-ghost-data:/var/lib/ghost/content
- /srv/docker/volume/lumieredesoy_ghost/config/config.production.json:/var/lib/ghost/config.production.json:ro - /srv/docker/volume/lumieredesoy_ghost/config/config.production.json:/var/lib/ghost/config.production.json:ro
env_file: env/lumieredesoy-ghost env_file: env/lumieredesoy-ghost
restart: always restart: always
ghost:
image: ghost:4-alpine
volumes:
- ghost-data:/var/lib/ghost/content
- /srv/docker/volume/ghost/config.production.json:/var/lib/ghost/config.production.json:ro
env_file: env/yann-ghost
restart: always
mem_limit: 512M
pdns: pdns:
image: pdns-alpine image: pdns-alpine
volumes: volumes:
@ -119,7 +129,7 @@ services:
dns: 192.168.3.2 dns: 192.168.3.2
networks: networks:
default: default:
ipv6_address: 2a01:e0a:5b7:35f1::53 ipv6_address: 2a01:e0a:49e:2b81::53
pdns-exporter: pdns-exporter:
image: debian:bullseye-slim image: debian:bullseye-slim
volumes: volumes:
@ -145,7 +155,6 @@ services:
volumes: volumes:
- /srv/www:/srv/www - /srv/www:/srv/www
restart: always restart: always
dns: 192.168.3.2
pgbouncer: pgbouncer:
image: pgbouncer-alpine image: pgbouncer-alpine
volumes: volumes:
@ -173,9 +182,9 @@ services:
- "quichante.vpn6:fd00::42:4" - "quichante.vpn6:fd00::42:4"
- "click.vpn6:fd00::42:6" - "click.vpn6:fd00::42:6"
- "quizz.vpn6:fd00::42:8" - "quizz.vpn6:fd00::42:8"
- "kiwi.verry.org:2a01:e0a:5b7:35f3::6" - "kiwi.verry.org:2a01:e0a:49e:2b83::6"
- "backup-01.dinoutoo.vpn:192.168.42.9" - "backup-01.dinoutoo.vpn:192.168.42.9"
- "home.verry.org:2a01:e0a:5b7:35f1::443" - "home.verry.org:2a01:e0a:49e:2b81::443"
- "mail.verry.org:192.168.3.5" - "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 command: -enableTCP6 -promscrape.config=/prometheus.yml -remoteWrite.url=http://victoria:8428/api/v1/write -sortLabels -promscrape.config.strictParse=false
restart: always restart: always
@ -239,7 +248,7 @@ services:
mem_limit: 128M mem_limit: 128M
networks: networks:
default: default:
ipv6_address: 2a01:e0a:5b7:35f1::514 ipv6_address: 2a01:e0a:49e:2b81::514
linky-exporter: linky-exporter:
userns_mode: "host" userns_mode: "host"
image: debian:bullseye-slim image: debian:bullseye-slim
@ -254,10 +263,8 @@ services:
image: victoriametrics/victoria-metrics image: victoriametrics/victoria-metrics
volumes: volumes:
- victoria-metrics:/victoria - victoria-metrics:/victoria
command: -storageDataPath /victoria -retentionPeriod 60 -enableTCP6 command: -storageDataPath /victoria -retentionPeriod 36 -enableTCP6
restart: always restart: always
cpus: 1
mem_limit: 2048M
dnsdist: dnsdist:
image: dnsdist image: dnsdist
volumes: volumes:
@ -270,7 +277,7 @@ services:
command: /usr/bin/dnsdist -u nobody -g nobody -C /etc/dnsdist.conf --supervised -v command: /usr/bin/dnsdist -u nobody -g nobody -C /etc/dnsdist.conf --supervised -v
networks: networks:
default: default:
ipv6_address: 2a01:e0a:5b7:35f1::853 ipv6_address: 2a01:e0a:49e:2b81::853
gitea: gitea:
image: gitea/gitea:dev image: gitea/gitea:dev
volumes: volumes: