diff --git a/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 index b4372c05..4cce4818 100644 --- a/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 @@ -62,7 +62,7 @@ services: - POSTGRES_DB=mailmandb - POSTGRES_USER=mailman - "POSTGRES_PASSWORD={{ secret__lists__postgres_password }}" - image: docker.io/library/postgres:12-alpine + image: docker.io/library/postgres:13-alpine volumes: - /opt/mailman/database:/var/lib/postgresql/data networks: diff --git a/resources/z9/z9-router/nftables/nftables.conf b/resources/z9/z9-router/nftables/nftables.conf index b82c3e02..46464d5c 100644 --- a/resources/z9/z9-router/nftables/nftables.conf +++ b/resources/z9/z9-router/nftables/nftables.conf @@ -113,6 +113,8 @@ table inet forward { # Fux PVE backups ip6 saddr { 2a07:c481:0:1::/64 } ip6 daddr { 2a07:c481:1:36::15/128 } accept comment "allow Fux PVE to access CCCHH PBS" + # chaosknoten PVE backups + ip6 saddr { 2a00:14b0:4200:3000::126:1/128 } ip6 daddr { 2a07:c481:1:36::15/128 } accept comment "allow chaosknoten PVE to access CCCHH PBS" # staubi and staubiv2 to club-assistant ip saddr { 10.89.212.232/32, 10.89.212.233/32 } ip daddr { 10.89.213.22/32 } accept comment "allow staubi and staubiv2 to club-assistant"