CCCHH/ansible-infra
CCCHH/ansible-infra
3
2
Fork 1
Code Issues 18 Pull requests 9 Wiki Activity Actions

Compare commits

base: CCCHH:228fe51b217c8b8568bbee811dd88663e8b59969
Branches Tags
CCCHH:main
CCCHH:renovate/docker.io-library-postgres-18.x
CCCHH:renovate/docker.io-library-postgres-17.x
CCCHH:renovate/docker.io-library-postgres-16.x
CCCHH:renovate/docker.io-library-postgres-15.x
CCCHH:renovate/docker.io-library-postgres-14.x
CCCHH:renovate/docker.io-library-postgres-13.x
CCCHH:renovate/docker.io-library-mariadb-12.x
CCCHH:renovate/all-stable-minor-patch
CCCHH:runner-dind
CCCHH:redirect-header
CCCHH:alloy
CCCHH:old-dns-zones
...
compare: CCCHH:373a99c7a6a41e780c57a05a44500b1e6937f07c
Branches Tags
CCCHH:renovate/docker.io-library-postgres-18.x
CCCHH:renovate/docker.io-library-postgres-17.x
CCCHH:renovate/docker.io-library-postgres-16.x
CCCHH:renovate/docker.io-library-postgres-15.x
CCCHH:renovate/docker.io-library-postgres-14.x
CCCHH:renovate/docker.io-library-postgres-13.x
CCCHH:renovate/docker.io-library-mariadb-12.x
CCCHH:renovate/all-stable-minor-patch
CCCHH:main
CCCHH:runner-dind
CCCHH:redirect-header
CCCHH:alloy
CCCHH:old-dns-zones

2 commits
228fe51b21 ... 373a99c7a6

Author SHA1 Message Date
Renovate
373a99c7a6 Update docker.io/library/postgres Docker tag to v15
All checks were successful
/ build (pull_request) Successful in 30s
Details
/ Ansible Lint (push) Successful in 2m37s
Details
/ Ansible Lint (pull_request) Successful in 2m39s
Details
2026-08-04 16:46:08 +00:00
Stefan Bethke
6c4f2dc9b6 Update with correct prefixes
All checks were successful
/ build (push) Successful in 30s
Details
/ Ansible Lint (push) Successful in 2m45s
Details
2026-08-04 18:44:51 +02:00
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
docs/guides/wiregueard-admin-vpn.md
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 |

2
resources/chaosknoten/lists/docker_compose/compose.yaml.j2
View file

@ -62,7 +62,7 @@ services:
- POSTGRES_DB=mailmandb - POSTGRES_DB=mailmandb
- POSTGRES_USER=mailman - POSTGRES_USER=mailman
- "POSTGRES_PASSWORD={{ secret__lists__postgres_password }}" - "POSTGRES_PASSWORD={{ secret__lists__postgres_password }}"
image: docker.io/library/postgres:12-alpine image: docker.io/library/postgres:15-alpine
volumes: volumes:
- /opt/mailman/database:/var/lib/postgresql/data - /opt/mailman/database:/var/lib/postgresql/data
networks: networks: