From d87c77b441e2560cd3d369a069a98951aabbf5a7 Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Sun, 10 Oct 2021 14:55:57 +0200
Subject: [PATCH] wip

---
 bin/wireguard_client_config   |  2 +-
 bundles/wireguard/metadata.py | 24 +++++++++++-------------
 nodes/home.server.py          |  2 +-
 nodes/htz.mails.py            |  2 +-
 nodes/netcup.secondary.py     |  2 +-
 nodes/wb.offsite-backups.py   |  2 +-
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/bin/wireguard_client_config b/bin/wireguard_client_config
index 3841253..49d6b68 100755
--- a/bin/wireguard_client_config
+++ b/bin/wireguard_client_config
@@ -13,7 +13,7 @@ data = server_node.metadata.get(f'wireguard/clients/{argv[1]}')
 sortable_client_routes = [
     ip_interface(server_node.metadata.get('network/internal/ipv4')).network,
 ]
-for peer in server_node.metadata.get('wireguard/peers').values():
+for peer in server_node.metadata.get('wireguard/s2s').values():
     for network in peer.get('route'):
         sortable_client_routes.append(ip_network(network))
         
diff --git a/bundles/wireguard/metadata.py b/bundles/wireguard/metadata.py
index f614d71..c8180d9 100644
--- a/bundles/wireguard/metadata.py
+++ b/bundles/wireguard/metadata.py
@@ -18,28 +18,28 @@ defaults = {
         },
     },
     'wireguard': {
-        'peers': {},
+        's2s': {},
         'clients': {},
     },
 }
 
 
 @metadata_reactor.provides(
-    'wireguard/peers',
+    'wireguard/s2s',
 )
 def s2s_peer_specific(metadata):
     return {
         'wireguard': {
-            'peers': {
-                peer: {
-                    'id': repo.get_node(peer).metadata.get(f'id'),
-                    'ip': repo.get_node(peer).metadata.get(f'wireguard/my_ip'),
-                    'endpoint': f'{repo.get_node(peer).hostname}:51820',
+            's2s': {
+                s2s: {
+                    'id': repo.get_node(s2s).metadata.get(f'id'),
+                    'ip': repo.get_node(s2s).metadata.get(f'wireguard/my_ip'),
+                    'endpoint': f'{repo.get_node(s2s).hostname}:51820',
                     'route': [
-                        str(ip_interface(repo.get_node(peer).metadata.get(f'wireguard/my_ip')).network),
+                        str(ip_interface(repo.get_node(s2s).metadata.get(f'wireguard/my_ip')).network),
                     ],
                 }
-                    for peer in metadata.get('wireguard/peers')
+                    for s2s in metadata.get('wireguard/s2s')
             },
         },
     }
@@ -82,9 +82,7 @@ def systemd_networkd_networks(metadata):
         },
     }
 
-    for peer, config in {
-        **metadata.get('wireguard/peers'),
-    }.items():
+    for peer, config in metadata.get('wireguard/s2s').items():
         for route in config.get('route', []):
             network.update({
                 f'Route#{peer}_{route}': {
@@ -119,7 +117,7 @@ def systemd_networkd_netdevs(metadata):
     }
     
     for peer, config in {
-        **metadata.get('wireguard/peers'),
+        **metadata.get('wireguard/s2s'),
         **metadata.get('wireguard/clients'),
     }.items():
         netdev.update({
diff --git a/nodes/home.server.py b/nodes/home.server.py
index b899b24..092d388 100644
--- a/nodes/home.server.py
+++ b/nodes/home.server.py
@@ -59,7 +59,7 @@
         },
         'wireguard': {
             'my_ip': '172.30.0.2/32',
-            'peers': {
+            's2s': {
                 'htz.mails': {
                     'route': [
                         '10.0.10.0/24',
diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py
index 22d4003..7ec0110 100644
--- a/nodes/htz.mails.py
+++ b/nodes/htz.mails.py
@@ -141,7 +141,7 @@
         },
         'wireguard': {
             'my_ip': '172.30.0.1/24',
-            'peers': {
+            's2s': {
                 'home.server': {
                     'route': [
                         '10.0.0.0/24',
diff --git a/nodes/netcup.secondary.py b/nodes/netcup.secondary.py
index d0c35b8..76b359a 100644
--- a/nodes/netcup.secondary.py
+++ b/nodes/netcup.secondary.py
@@ -32,7 +32,7 @@
         # },
         'wireguard': {
             'my_ip': '172.30.0.3/32',
-            'peers': {
+            's2s': {
                 'htz.mails': {
                     'route': [
                         '10.0.0.0/24',
diff --git a/nodes/wb.offsite-backups.py b/nodes/wb.offsite-backups.py
index 5e77f70..874e9ce 100644
--- a/nodes/wb.offsite-backups.py
+++ b/nodes/wb.offsite-backups.py
@@ -23,7 +23,7 @@
         },
         'wireguard': {
             'my_ip': '172.30.0.4/32',
-            'peers': {
+            's2s': {
                 'htz.mails': {
                     'route': [
                         '10.0.0.0/24',