Compare commits
2 commits
206e258717
...
0ba3d579ef
| Author | SHA1 | Date | |
|---|---|---|---|
| 0ba3d579ef | |||
| 6c4f2dc9b6 |
2 changed files with 13 additions and 8 deletions
|
|
@ -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 |
|
||||
| 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 |
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue