Compare commits
42 commits
4fbac5cfe6
...
69c36161be
| Author | SHA1 | Date | |
|---|---|---|---|
|
69c36161be |
|||
|
b57b216d7b |
|||
|
251f0c61d2 |
|||
|
71f39678d1 |
|||
|
1ac7f13e79 |
|||
|
21585c6271 |
|||
|
0fb738411c |
|||
|
031fa6af9c |
|||
|
80ce470e04 |
|||
|
164c7c1447 |
|||
|
210da2ab4d |
|||
|
84fe7fa4c0 |
|||
|
ab6e812244 |
|||
|
2f8b38b6a1 |
|||
|
d2f91f2f28 |
|||
|
162da4b9f6 |
|||
|
97b02ab59a |
|||
|
32fea8c540 |
|||
|
86710851b4 |
|||
|
9dcdac403c |
|||
|
3df834021a |
|||
|
114dfa5ebf |
|||
|
ce94115331 |
|||
|
784ea057c0 |
|||
|
240315190c |
|||
|
4bf213920b |
|||
|
1fd1cdad39 |
|||
|
a6799bc905 |
|||
|
70bcc322e6 |
|||
|
08c098766a |
|||
|
2bed99ef0f |
|||
|
1eea864297 |
|||
|
0ca1ad0760 |
|||
|
c950dd7ba7 |
|||
|
baa439f0b2 |
|||
|
d5aa0001cd |
|||
|
04c4bac819 |
|||
|
aff7431cdd |
|||
|
969f7b4c8d |
|||
|
608437746b |
|||
|
a5d8b11517 |
|||
|
90f4ecbcc5 |
10 changed files with 5 additions and 69 deletions
|
|
@ -1,43 +0,0 @@
|
||||||
---
|
|
||||||
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
|
|
||||||
|
|
||||||
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/128
|
|
||||||
|
|
||||||
[Peer]
|
|
||||||
PublicKey = fmlxjh3iOfpgrHQQpK3dyOD0BvDppGCUkFuMSroqQR4=
|
|
||||||
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
|
|
||||||
```
|
|
||||||
|
|
||||||
## AllowedIDs
|
|
||||||
|
|
||||||
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 |
|
|
||||||
|--|--|
|
|
||||||
| [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.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 |
|
|
||||||
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
# renovate: datasource=docker depName=codeberg.org/git-pages/git-pages
|
|
||||||
git_pages__version: latest
|
|
||||||
|
|
@ -6,9 +6,3 @@ docker_compose__configuration_files:
|
||||||
content: "{{ lookup('ansible.builtin.template', 'resources/z9/yate/docker_compose/regexroute.conf.j2') }}"
|
content: "{{ lookup('ansible.builtin.template', 'resources/z9/yate/docker_compose/regexroute.conf.j2') }}"
|
||||||
- name: regfile.conf
|
- name: regfile.conf
|
||||||
content: "{{ lookup('ansible.builtin.template', 'resources/z9/yate/docker_compose/regfile.conf.j2') }}"
|
content: "{{ lookup('ansible.builtin.template', 'resources/z9/yate/docker_compose/regfile.conf.j2') }}"
|
||||||
- name: rmanager.conf
|
|
||||||
content: "{{ lookup('ansible.builtin.template', 'resources/z9/yate/docker_compose/rmanager.conf.j2') }}"
|
|
||||||
- name: yrtpchan.conf
|
|
||||||
content: "{{ lookup('ansible.builtin.template', 'resources/z9/yate/docker_compose/yrtpchan.conf.j2') }}"
|
|
||||||
- name: ysipchan.conf
|
|
||||||
content: "{{ lookup('ansible.builtin.template', 'resources/z9/yate/docker_compose/ysipchan.conf.j2') }}"
|
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ all:
|
||||||
ansible_host: waybackproxy.ccchh.net
|
ansible_host: waybackproxy.ccchh.net
|
||||||
ansible_user: chaos
|
ansible_user: chaos
|
||||||
yate:
|
yate:
|
||||||
ansible_host: yate.z9.ccchh.net
|
ansible_host: yate.ccchh.net
|
||||||
ansible_user: chaos
|
ansible_user: chaos
|
||||||
z9-router:
|
z9-router:
|
||||||
ansible_host: z9-router.ccchh.net
|
ansible_host: z9-router.ccchh.net
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,7 @@ services:
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: ["uv", "run", "main.py", "sync"]
|
command: ["uv", "run", "main.py", "sync"]
|
||||||
environment:
|
environment:
|
||||||
- DRY_RUN=false
|
- DRY_RUN=true
|
||||||
- KEYCLOAK_CLIENT_ID=mailman-sync
|
- KEYCLOAK_CLIENT_ID=mailman-sync
|
||||||
- KEYCLOAK_CLIENT_SECRET={{ secret__lists__keycloak_client_secret }}
|
- KEYCLOAK_CLIENT_SECRET={{ secret__lists__keycloak_client_secret }}
|
||||||
- KEYCLOAK_REALM=ccchh
|
- KEYCLOAK_REALM=ccchh
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ x-shared:
|
||||||
LETSENCRYPT_HOST:
|
LETSENCRYPT_HOST:
|
||||||
LETSENCRYPT_EMAIL:
|
LETSENCRYPT_EMAIL:
|
||||||
|
|
||||||
image: ${IMAGE_REPO:-ghcr.io/zammad/zammad}:${VERSION:-7.1.2}
|
image: ${IMAGE_REPO:-ghcr.io/zammad/zammad}:${VERSION:-6.5.3}
|
||||||
restart: ${RESTART:-always}
|
restart: ${RESTART:-always}
|
||||||
volumes:
|
volumes:
|
||||||
- zammad-storage:/opt/zammad/storage
|
- zammad-storage:/opt/zammad/storage
|
||||||
|
|
@ -76,7 +76,7 @@ services:
|
||||||
user: 0:0
|
user: 0:0
|
||||||
|
|
||||||
zammad-elasticsearch:
|
zammad-elasticsearch:
|
||||||
image: elasticsearch:${ELASTICSEARCH_VERSION:-8.19.19}
|
image: elasticsearch:${ELASTICSEARCH_VERSION:-8.19.13}
|
||||||
restart: ${RESTART:-always}
|
restart: ${RESTART:-always}
|
||||||
volumes:
|
volumes:
|
||||||
- elasticsearch-data:/usr/share/elasticsearch/data
|
- elasticsearch-data:/usr/share/elasticsearch/data
|
||||||
|
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
; https://github.com/eventphone/yate/blob/master/conf.d/rmanager.conf.sample
|
|
||||||
[general]
|
|
||||||
; password: string: Password required to authenticate as admin, default empty!
|
|
||||||
;password=
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
; https://github.com/eventphone/yate/blob/master/conf.d/yrtpchan.conf.sample
|
|
||||||
[general]
|
|
||||||
minport=42000
|
|
||||||
maxport=42999
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
; Setting for all SIP channels
|
|
||||||
; https://github.com/eventphone/yate/blob/master/conf.d/ysipchan.conf.sample
|
|
||||||
|
|
||||||
[general]
|
|
||||||
; try to avoid `Transport(general) received likely truncated packet with length 1500, try to increase maxpkt`
|
|
||||||
maxpkt=8192
|
|
||||||
|
|
@ -45,3 +45,4 @@ argument_specs:
|
||||||
apiKey:
|
apiKey:
|
||||||
required: true
|
required: true
|
||||||
type: str
|
type: str
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue