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-07-14 12:06:43 +02:00
parent ac5482335d
commit 6e9610d797
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bundles/wireguard/metadata.py
View file

@ -90,10 +90,10 @@ def systemd_networkd_netdevs(metadata):
'Endpoint': config['endpoint'], 'Endpoint': config['endpoint'],
'PublicKey': config['pubkey'], 'PublicKey': config['pubkey'],
'PresharedKey': config['psk'], 'PresharedKey': config['psk'],
'AllowedIPs': ', '.join([ 'AllowedIPs': ', '.join(sorted([
str(ip_interface(repo.get_node(peer).metadata.get(f'wireguard/my_ip')).ip), str(ip_interface(repo.get_node(peer).metadata.get(f'wireguard/my_ip')).ip),
*config.get('route', []), *config.get('route', []),
]), # FIXME ])), # FIXME
'PersistentKeepalive': 30, 'PersistentKeepalive': 30,
} }
}) })

2
libs/systemd.py
View file

@ -9,7 +9,7 @@ template = '''
[${segment.split('#')[0]}] [${segment.split('#')[0]}]
% for option, value in sorted(options.items()): % for option, value in sorted(options.items()):
% if isinstance(value, dict): % if isinstance(value, dict):
% for k, v in value.items(): % for k, v in sorted(value.items()):
${option}=${k}=${v} ${option}=${k}=${v}
% endfor % endfor
% elif isinstance(value, (list, set, tuple)): % elif isinstance(value, (list, set, tuple)):