From 6c4f2dc9b6c3ff0456bee0e18411afbee7c1319f Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Tue, 4 Aug 2026 18:44:51 +0200 Subject: [PATCH 1/2] Update with correct prefixes --- docs/guides/wiregueard-admin-vpn.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/docs/guides/wiregueard-admin-vpn.md b/docs/guides/wiregueard-admin-vpn.md index ad7bfa06..4d08bd51 100644 --- a/docs/guides/wiregueard-admin-vpn.md +++ b/docs/guides/wiregueard-admin-vpn.md @@ -13,14 +13,16 @@ tbd. where to add your key Replace `YOUR_IP_IN_DEC` with your IP in decimal, and `YOUR_IP_IN_HEX` with your IP in hexadecimal. +See [resources/z9/z9-router/systemd_networkd/10-wg56.netdev](resources/z9/z9-router/systemd_networkd/10-wg56.netdev) for the Wireguard endpoints configured on the router. + ``` [Interface] PrivateKey = YOUR_PRIVATE_KEY -Address = 10.89.214.YOUR_IP_IN_DEC/32, 2a07:c481:1:37::YOUR_IP_IN_HEX +Address = 10.89.214.YOUR_IP_IN_DEC/32, 2a07:c481:1:37::YOUR_IP_IN_HEX/128 [Peer] PublicKey = fmlxjh3iOfpgrHQQpK3dyOD0BvDppGCUkFuMSroqQR4= -AllowedIPs = 10.89.208.0/20, 2a07:c481:1::/48, 212.12.48.126/32, 2a00:14b0:42:100::/56, 2a00:14b0:4200:3000::/64 +AllowedIPs = 10.89.208.0/20, 2a07:c481:1::/48, 212.12.48.120/29, 2a00:14b0:4200:3000::/64, 212.12.50.208/29, 2a00:14b0:42:100::/56, 212.12.51.128/28, 2a00:14b0:f000:23::/64 Endpoint = rt-wan.ccchh.net:51820 ``` @@ -32,7 +34,10 @@ The following prefixes should be tunneled to gain access to both CCCHH Z9 resour |--|--| | [10.89.208.0/20](https://netbox.hamburg.ccc.de/ipam/prefixes/114/prefixes/) | prefix for CCCHH Z9 local networks | | [2a07:c481:1::/48](https://netbox.hamburg.ccc.de/ipam/prefixes/50/) | prefix for CCCHH Z9 local networks | -| [212.12.48.126/32](https://netbox.hamburg.ccc.de/ipam/ip-addresses/30/) | public IP of chaosknoten | -| [2a00:14b0:4200:3000::126:1/128](https://netbox.hamburg.ccc.de/ipam/ip-addresses/255/) | public IP of chaosknoten | -| [2a00:14b0:42:100::/56/128](https://netbox.hamburg.ccc.de/ipam/prefixes/46/) | new IPv6 for VMs on chaosknoten | -| [2a00:14b0:4200:3000::/64](https://netbox.hamburg.ccc.de/ipam/prefixes/36/) | old IPv6 for VMs on chaosknoten | \ No newline at end of file +| 212.12.48.120/29 | Fakep refix for hosts that come from [212.12.48.0/24](https://netbox.hamburg.ccc.de/ipam/prefixes/12/) | +| [2a00:14b0:4200:3000::/64](https://netbox.hamburg.ccc.de/ipam/prefixes/36/) | Public IPv6 in Wieske's shared network | +| [212.12.50.208/29](https://netbox.hamburg.ccc.de/ipam/prefixes/13/) | Public IPv4 for VMs on chaosknoten, routed by router | +| [2a00:14b0:42:100::/56](https://netbox.hamburg.ccc.de/ipam/prefixes/46/) | Public IPv6 for VMs on chaosknoten, routed by router | +| [212.12.51.128/28](https://netbox.hamburg.ccc.de/ipam/prefixes/15/) | IPv4 for VMs on chaosknoten, routed by Wieske | +| [2a00:14b0:f000:23::/64](https://netbox.hamburg.ccc.de/ipam/prefixes/35/) |IPv6 for VMs on chaosknoten, routed by Wieske | + From 373a99c7a6a41e780c57a05a44500b1e6937f07c Mon Sep 17 00:00:00 2001 From: Renovate Date: Tue, 4 Aug 2026 16:46:08 +0000 Subject: [PATCH 2/2] Update docker.io/library/postgres Docker tag to v15 --- resources/chaosknoten/lists/docker_compose/compose.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 b/resources/chaosknoten/lists/docker_compose/compose.yaml.j2 index b4372c05..3f4a48e6 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:15-alpine volumes: - /opt/mailman/database:/var/lib/postgresql/data networks: