From b59c691b5f15a7f57de26da50853883e6769205f Mon Sep 17 00:00:00 2001
From: mwiegand <mwiegand@seibert-media.net>
Date: Tue, 13 Jul 2021 16:52:13 +0200
Subject: [PATCH] wip

---
 nodes/home.backups.py     |  6 +++---
 nodes/htz.mails.py        | 31 +++++++++++++------------------
 nodes/netcup.secondary.py |  8 ++++----
 3 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/nodes/home.backups.py b/nodes/home.backups.py
index 3e5c9df..3aeaadc 100644
--- a/nodes/home.backups.py
+++ b/nodes/home.backups.py
@@ -10,9 +10,6 @@
     ],
     'metadata': {
         'id': '9cf52515-63a1-4659-a8ec-6c3c881727e5',
-        'backup-server': {
-            'hostname': 'backups.sublimity.de',
-        },
         'network': {
             'internal': {
                 'interface': 'enp1s0',
@@ -20,6 +17,9 @@
                 'gateway4': '10.0.0.1',
             },
         },
+        'backup-server': {
+            'hostname': 'backups.sublimity.de',
+        },
         'zfs': {
             'pools': {
                 'tank': {
diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py
index 2b5c015..db4dd6e 100644
--- a/nodes/htz.mails.py
+++ b/nodes/htz.mails.py
@@ -15,6 +15,19 @@
     ],
     'metadata': {
         'id': 'ea29bdf0-0b47-4bf4-8346-67d60c9dc4ae',
+        'network': {
+            'internal': {
+                'interface': 'ens10',
+                'ipv4': '10.0.10.2/24',
+            },
+            'external': {
+                'interface': 'eth0',
+                'ipv4': '162.55.188.157/32',
+                'ipv6': '2a01:4f8:1c1c:4121::2/64',
+                'gateway4': '172.31.1.1',
+                'gateway6': 'fe80::1',
+            }
+        },
         'bind': {
             'hostname': 'resolver.name',
             'zones': {
@@ -48,19 +61,6 @@
                 'freibrief.net': {},
             },
         },
-        'network': {
-            'internal': {
-                'interface': 'ens10',
-                'ipv4': '10.0.10.2/24',
-            },
-            'external': {
-                'interface': 'eth0',
-                'ipv4': '162.55.188.157/32',
-                'ipv6': '2a01:4f8:1c1c:4121::2/64',
-                'gateway4': '172.31.1.1',
-                'gateway6': 'fe80::1',
-            }
-        },
         'mailserver': {
             'hostname': 'mail.sublimity.de',
             'admin_email': 'postmaster@sublimity.de',
@@ -158,10 +158,5 @@
                 },
             },
         },
-        'archive': {
-            'paths': {
-                '/var/test': {},
-            },
-        },
     },
 }
diff --git a/nodes/netcup.secondary.py b/nodes/netcup.secondary.py
index c9db5ee..02d5f0b 100644
--- a/nodes/netcup.secondary.py
+++ b/nodes/netcup.secondary.py
@@ -9,10 +9,6 @@
     ],
     'metadata': {
         'id': '890848b2-a900-4f74-ad5b-b811fbb4f0bc',
-        'postfix': {
-            'master_node': 'htz.mails',
-            'hostname': 'mail2.sublimity.de',
-        },
         'network': {
             'external': {
                 'interface': 'eth0',
@@ -30,6 +26,10 @@
             'master_node': 'htz.mails',
             'hostname': 'second.resolver.name',
         },
+        # 'postfix': {
+        #     'master_node': 'htz.mails',
+        #     'hostname': 'mail2.sublimity.de',
+        # },
         'wireguard': {
             'my_ip': '172.30.0.3/24',
             'peers': {