From 6ff41f97a39b17b4617de2137a4545523a8d1a35 Mon Sep 17 00:00:00 2001 From: Renovate Date: Sun, 2 Aug 2026 15:31:27 +0000 Subject: [PATCH 1/4] Update docker.io/pretalx/standalone Docker tag to v2025.2.3 --- resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 index dea2dfb1..38b04874 100644 --- a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 @@ -33,7 +33,7 @@ services: - pretalx_net pretalx: - image: docker.io/pretalx/standalone:v2025.1.0 + image: docker.io/pretalx/standalone:v2025.2.3 entrypoint: gunicorn command: - "pretalx.wsgi" @@ -78,7 +78,7 @@ services: - pretalx_net celery: - image: docker.io/pretalx/standalone:v2025.1.0 + image: docker.io/pretalx/standalone:v2025.2.3 command: - taskworker restart: unless-stopped From 24124e9f3d45d3f02e8d8f87a4defbc932a4c197 Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Sun, 2 Aug 2026 18:09:29 +0200 Subject: [PATCH 2/4] Document wg setup First step for #133 --- docs/guides/wiregueard-admin-vpn.md | 36 +++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 docs/guides/wiregueard-admin-vpn.md diff --git a/docs/guides/wiregueard-admin-vpn.md b/docs/guides/wiregueard-admin-vpn.md new file mode 100644 index 00000000..ce54a15e --- /dev/null +++ b/docs/guides/wiregueard-admin-vpn.md @@ -0,0 +1,36 @@ +--- +title: "Wiregard Admin VPN" +summary: How to configure your Wireguard client to access the Z9 network +--- + +# Onboarding + +tbd. where to add your key + +# Local Client Configuration + +## Example Config + +``` +[Interface] +PrivateKey = YOUR_PRIVATE_KEY +Address = 172.31.202.YOUR_IP/32 + +[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 +Endpoint = rt-wan.ccchh.net:51820 +``` + +## AllowedIDs + +The following prefixes should be tunneled to gain access to both CCCHH Z9 resources as well as Chaosknoten + +| Prefix | Description | +|--|--| +| [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 From 9266123f42abbf5fa1ac7d0576f6d783b00e1bfb Mon Sep 17 00:00:00 2001 From: Stefan Bethke Date: Sun, 2 Aug 2026 18:12:02 +0200 Subject: [PATCH 3/4] Explain that you can use a default route #133 --- docs/guides/wiregueard-admin-vpn.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guides/wiregueard-admin-vpn.md b/docs/guides/wiregueard-admin-vpn.md index ce54a15e..14330b9c 100644 --- a/docs/guides/wiregueard-admin-vpn.md +++ b/docs/guides/wiregueard-admin-vpn.md @@ -24,7 +24,7 @@ Endpoint = rt-wan.ccchh.net:51820 ## AllowedIDs -The following prefixes should be tunneled to gain access to both CCCHH Z9 resources as well as Chaosknoten +The following prefixes should be tunneled to gain access to both CCCHH Z9 resources as well as Chaosknoten. It is also possible to run a default route through wireguard, but please do not abuse this as a general VPN for purposes other than admin tasks. | Prefix | Description | |--|--| From 867c7ea18dd77125de38a302da39a5c7eca3351a Mon Sep 17 00:00:00 2001 From: Renovate Date: Sun, 2 Aug 2026 16:16:26 +0000 Subject: [PATCH 4/4] Update docker.io/pretalx/standalone Docker tag to v2025.2.3 --- resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 index dea2dfb1..38b04874 100644 --- a/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 +++ b/resources/chaosknoten/pretalx/docker_compose/compose.yaml.j2 @@ -33,7 +33,7 @@ services: - pretalx_net pretalx: - image: docker.io/pretalx/standalone:v2025.1.0 + image: docker.io/pretalx/standalone:v2025.2.3 entrypoint: gunicorn command: - "pretalx.wsgi" @@ -78,7 +78,7 @@ services: - pretalx_net celery: - image: docker.io/pretalx/standalone:v2025.1.0 + image: docker.io/pretalx/standalone:v2025.2.3 command: - taskworker restart: unless-stopped