Compare commits

...
Author SHA1 Message Date
b58cc00010 Update all stable non-major dependencies
All checks were successful
/ build (pull_request) Successful in 33s
/ Ansible Lint (push) Successful in 2m41s
/ Ansible Lint (pull_request) Successful in 2m43s
2026-08-04 16:45:53 +00:00
6c4f2dc9b6 Update with correct prefixes
All checks were successful
/ build (push) Successful in 30s
/ Ansible Lint (push) Successful in 2m45s
2026-08-04 18:44:51 +02:00
6 changed files with 19 additions and 14 deletions

View file

@ -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. 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] [Interface]
PrivateKey = YOUR_PRIVATE_KEY 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] [Peer]
PublicKey = fmlxjh3iOfpgrHQQpK3dyOD0BvDppGCUkFuMSroqQR4= 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 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 | | [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 | | [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 | | 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::126:1/128](https://netbox.hamburg.ccc.de/ipam/ip-addresses/255/) | public IP of chaosknoten | | [2a00:14b0:4200:3000::/64](https://netbox.hamburg.ccc.de/ipam/prefixes/36/) | Public IPv6 in Wieske's shared network |
| [2a00:14b0:42:100::/56/128](https://netbox.hamburg.ccc.de/ipam/prefixes/46/) | new IPv6 for VMs on chaosknoten | | [212.12.50.208/29](https://netbox.hamburg.ccc.de/ipam/prefixes/13/) | Public IPv4 for VMs on chaosknoten, routed by router |
| [2a00:14b0:4200:3000::/64](https://netbox.hamburg.ccc.de/ipam/prefixes/36/) | old IPv6 for VMs on chaosknoten | | [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 |

View file

@ -1,5 +1,5 @@
# renovate: datasource=github-releases depName=netbox packageName=netbox-community/netbox # renovate: datasource=github-releases depName=netbox packageName=netbox-community/netbox
netbox__version: "v4.6.4" netbox__version: "v4.6.7"
netbox__config: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/netbox/netbox/configuration.py.j2') }}" netbox__config: "{{ lookup('ansible.builtin.template', 'resources/chaosknoten/netbox/netbox/configuration.py.j2') }}"
netbox__custom_pipeline_oidc_group_and_role_mapping: true netbox__custom_pipeline_oidc_group_and_role_mapping: true

View file

@ -2,7 +2,7 @@
services: services:
prometheus: prometheus:
image: docker.io/prom/prometheus:v3.13.1 image: docker.io/prom/prometheus:v3.13.2
container_name: prometheus container_name: prometheus
command: command:
- '--config.file=/etc/prometheus/prometheus.yml' - '--config.file=/etc/prometheus/prometheus.yml'
@ -32,7 +32,7 @@ services:
- alertmanager_data:/alertmanager - alertmanager_data:/alertmanager
grafana: grafana:
image: docker.io/grafana/grafana:13.1.0 image: docker.io/grafana/grafana:13.1.2
container_name: grafana container_name: grafana
ports: ports:
- 3000:3000 - 3000:3000
@ -59,7 +59,7 @@ services:
- /dev/null:/etc/prometheus/pve.yml - /dev/null:/etc/prometheus/pve.yml
loki: loki:
image: docker.io/grafana/loki:3.7.3 image: docker.io/grafana/loki:3.7.4
container_name: loki container_name: loki
ports: ports:
- 13100:3100 - 13100:3100

View file

@ -1,7 +1,7 @@
--- ---
services: services:
ntfy: ntfy:
image: docker.io/binwiederhier/ntfy:v2.26.0 image: docker.io/binwiederhier/ntfy:v2.27.0
container_name: ntfy container_name: ntfy
command: command:
- serve - serve

View file

@ -15,7 +15,7 @@ services:
- pretalx_net - pretalx_net
redis: redis:
image: docker.io/library/redis:8.8.0 image: docker.io/library/redis:8.10.0
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- redis:/data - redis:/data
@ -23,7 +23,7 @@ services:
- pretalx_net - pretalx_net
static: static:
image: docker.io/library/nginx:1.31.2 image: docker.io/library/nginx:1.31.3
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- public:/usr/share/nginx/html - public:/usr/share/nginx/html

View file

@ -13,7 +13,7 @@ services:
restart: unless-stopped restart: unless-stopped
redis: redis:
image: docker.io/library/redis:8.8.0 image: docker.io/library/redis:8.10.0
ports: ports:
- "6379:6379" - "6379:6379"
volumes: volumes: