From 3b89fb7886b940d562aa780e7be31bccd6529dcc Mon Sep 17 00:00:00 2001
From: cronekorkn <git@ckn.li>
Date: Mon, 23 Sep 2024 20:42:19 +0200
Subject: [PATCH] wip

---
 bundles/kea-dhcpd/metadata.py | 12 +++++------
 bundles/telegraf/items.py     |  2 +-
 nodes/home.router.py          | 39 -----------------------------------
 3 files changed, 7 insertions(+), 46 deletions(-)

diff --git a/bundles/kea-dhcpd/metadata.py b/bundles/kea-dhcpd/metadata.py
index 73065e7..7407759 100644
--- a/bundles/kea-dhcpd/metadata.py
+++ b/bundles/kea-dhcpd/metadata.py
@@ -12,15 +12,15 @@ defaults = {
     'kea': {
         'Dhcp4': {
             'interfaces-config': {
-                'interfaces': [],
+                'interfaces': set(),
             },
             'lease-database': {
                 'type': 'memfile',
                 'lfc-interval': 3600
             },
-            'subnet4': [],
-            'loggers': [
-                {
+            'subnet4': set(),
+            'loggers': set([
+                hashable({
                     'name': 'kea-dhcp4',
                     'output_options': [
                         {
@@ -28,8 +28,8 @@ defaults = {
                         }
                     ],
                     'severity': 'INFO',
-                },
-            ],
+                }),
+            ]),
         },
     },
 }
diff --git a/bundles/telegraf/items.py b/bundles/telegraf/items.py
index 6974535..e674846 100644
--- a/bundles/telegraf/items.py
+++ b/bundles/telegraf/items.py
@@ -9,7 +9,7 @@ files = {
                 node.metadata.get('telegraf/config'),
                 cls=MetadataJSONEncoder,
             )),
-            sort_keys=True
+            sort_keys=True,
         ),
         'triggers': [
             'svc_systemd:telegraf:restart',
diff --git a/nodes/home.router.py b/nodes/home.router.py
index c97f7e9..57fffba 100644
--- a/nodes/home.router.py
+++ b/nodes/home.router.py
@@ -43,45 +43,6 @@
                 'dhcp_server': True,
             },
         },
-        'kea': {
-            'Dhcp4': {
-                #'interfaces-config': {
-                #    'interfaces': {'eno1', 'iot', 'guest'},
-                #},
-                # 'subnet4': [
-                #     {
-                #         'subnet': '10.0.0.0/24',
-                #         'pools': [
-                #             { 'pool': '10.0.0.100 - 10.0.0.200' },
-                #         ],
-                #         'option-data': [
-                #             { 'name': 'routers', 'data': '10.0.0.1' },
-                #             { 'name': 'domain-name-servers', 'data': '10.0.10.2' },
-                #         ],
-                #     },
-                #     {
-                #         'subnet': '10.0.2.0/24',
-                #         'pools': [
-                #             { 'pool': '10.0.2.100 - 10.0.2.200' },
-                #         ],
-                #         'option-data': [
-                #             { 'name': 'routers', 'data': '10.0.2.1' },
-                #             { 'name': 'domain-name-servers', 'data': '10.0.10.2' },
-                #         ],
-                #     },
-                #     {
-                #         'subnet': '10.0.9.0/24',
-                #         'pools': [
-                #             { 'pool': '10.0.9.100 - 10.0.9.200' },
-                #         ],
-                #         'option-data': [
-                #             { 'name': 'routers', 'data': '10.0.9.1' },
-                #             { 'name': 'domain-name-servers', 'data': '10.0.10.2' },
-                #         ],
-                #     },
-                # ],
-            },
-        },
         'nftables': {
             'forward': {
                 # Drop DHCP client requests (UDP port 68)