From d374dddf0ba814b70f98bda2e2aa28429c03661b Mon Sep 17 00:00:00 2001
From: cronekorkn <git@ckn.li>
Date: Sun, 22 Sep 2024 01:05:57 +0200
Subject: [PATCH] wip

---
 bundles/linux/items.py      | 12 +++++-------
 nodes/home.router.py        |  2 +-
 nodes/home.server.py        |  7 +++++++
 nodes/htz.mails.py          |  3 ++-
 nodes/wb.offsite-backups.py |  1 +
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/bundles/linux/items.py b/bundles/linux/items.py
index 276f82a..5229c7f 100644
--- a/bundles/linux/items.py
+++ b/bundles/linux/items.py
@@ -22,22 +22,20 @@ files= {
             ),
         ),
         'triggers': [
-            'action:reload_sysctl.conf',
+            'svc_systemd:systemd-sysctl.service:restart',
         ],
     },
 }
 
-actions = {
-    'reload_sysctl.conf': {
-        'command': 'sysctl --system',
-        'triggered': True,
-    },
+svc_systemd = {
+    'systemd-sysctl.service': {},
 }
 
 for path, value in key_value_pairs:
     actions[f'reload_sysctl.conf_{path}'] = {
         'command': f"sysctl --values {'.'.join(path)}  | grep -q {quote('^'+value+'$')}",
         'needs': [
-            f'action:reload_sysctl.conf',
+            f'action:systemd-sysctl.service',
+            f'action:systemd-sysctl.service:restart',
         ],
     }
diff --git a/nodes/home.router.py b/nodes/home.router.py
index e4913a4..ade9d0b 100644
--- a/nodes/home.router.py
+++ b/nodes/home.router.py
@@ -36,7 +36,7 @@
                         ],
                         'option-data': [
                             { 'name': 'routers', 'data': '10.0.0.1' },
-                            { 'name': 'domain-name-servers', 'data': '1.1.1.1, 8.8.8.8, 9.9.9.9' },
+                            { 'name': 'domain-name-servers', 'data': '10.0.10.2' },
                         ],
                     },
                 ],
diff --git a/nodes/home.server.py b/nodes/home.server.py
index 73c1465..48270e9 100644
--- a/nodes/home.server.py
+++ b/nodes/home.server.py
@@ -145,6 +145,13 @@
         'steam-chat-viewer': {
             'hostname': 'steam-chats.ckn.li',
         },
+        'sysctl': {
+            'net': {
+                'ipv4': {
+                    'ip_forward': 1,
+                },
+            },
+        },
         'systemd-swap': 4_000_000_000,
         'tasmota-charge': {
             'phone': {
diff --git a/nodes/htz.mails.py b/nodes/htz.mails.py
index 7a2181d..418fdc9 100644
--- a/nodes/htz.mails.py
+++ b/nodes/htz.mails.py
@@ -1,7 +1,7 @@
 {
     'hostname': '49.12.184.229',
     'groups': [
-        #'backup',
+        'backup',
         'debian-12',
         'hetzner-cloud',
         'mailserver',
@@ -215,6 +215,7 @@
                         '10.0.0.0/24',
                         '10.0.2.0/24',
                         '10.0.9.0/24',
+                        '10.0.99.0/24',
                     ],
                 },
                 'ovh.secondary': {
diff --git a/nodes/wb.offsite-backups.py b/nodes/wb.offsite-backups.py
index 870304d..de5fc49 100644
--- a/nodes/wb.offsite-backups.py
+++ b/nodes/wb.offsite-backups.py
@@ -1,4 +1,5 @@
 {
+    'dummy': True,
     'hostname': '192.168.179.20',
     'groups': [
         'debian-11',