cronekorkn/bundlewrap
1
0
Fork 0
Code Issues Pull requests 8 Projects Releases Wiki Activity

wip

Browse source
This commit is contained in:
mwiegand 2021-06-29 02:32:58 +02:00
parent ce341a4d08
commit ca5eb9d50b
4 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bundles/wireguard/metadata.py
View file

@ -90,13 +90,16 @@ def systemd_networkd_netdevs(metadata):
}, },
} }
for name, config in metadata.get('wireguard/peers').items(): for peer, config in metadata.get('wireguard/peers').items():
netdev.update({ netdev.update({
f'WireGuardPeer#{name}': { f'WireGuardPeer#{peer}': {
'Endpoint': config['endpoint'], 'Endpoint': config['endpoint'],
'PublicKey': config['pubkey'], 'PublicKey': config['pubkey'],
'PresharedKey': config['psk'], 'PresharedKey': config['psk'],
'AllowedIPs': '0.0.0.0/0', # FIXME 'AllowedIPs': ', '.join([
str(ip_interface(repo.get_node(peer).metadata.get(f'wireguard/my_ip')).ip),
*config.get('route', []),
]), # FIXME
'PersistentKeepalive': 30, 'PersistentKeepalive': 30,
} }
}) })

3
nodes/home.server.py
View file

@ -31,11 +31,12 @@
}, },
}, },
'wireguard': { 'wireguard': {
'my_ip': '172.30.0.1/24', 'my_ip': '172.30.0.2/24',
'peers': { 'peers': {
'htz.mails': { 'htz.mails': {
'route': [ 'route': [
'10.0.10.0/24', '10.0.10.0/24',
'10.0.11.0/24',
], ],
}, },
}, },

5
nodes/htz.mails.py
View file

@ -102,7 +102,7 @@
}, },
'wireguard': { 'wireguard': {
# ip r add 10.0.0.0/24 via 172.19.136.2 dev wg0 # ip r add 10.0.0.0/24 via 172.19.136.2 dev wg0
'my_ip': '172.30.0.2/24', 'my_ip': '172.30.0.1/24',
'peers': { 'peers': {
'home.server': { 'home.server': {
'route': [ 'route': [
@ -112,6 +112,9 @@
], ],
}, },
'netcup.secondary': { 'netcup.secondary': {
'route': [
'10.0.11.0/24',
],
}, },
}, },
}, },

19
nodes/netcup.secondary.py
View file

@ -16,18 +16,21 @@
'ipv6': '2a03:4000:7:534::2/64', 'ipv6': '2a03:4000:7:534::2/64',
'gateway6': 'fe80::1', 'gateway6': 'fe80::1',
}, },
'internal': {
'interface': 'eth1',
'ipv4': '10.0.11.2',
},
}, },
'wireguard': { 'wireguard': {
# 172.19.136.0/22 dev wg0 proto kernel scope link src 172.19.136.3 'my_ip': '172.30.0.3/24',
'my_ip': '172.30.0.1/24',
'peers': { 'peers': {
'htz.mails': { 'htz.mails': {
# 'route': [ 'route': [
# '10.0.0.0/24', '10.0.0.0/24',
# '10.0.2.0/24', '10.0.2.0/24',
# '10.0.9.0/24', '10.0.9.0/24',
# '10.0.10.0/24', '10.0.10.0/24',
# ], ],
}, },
}, },
}, },