bundles/kea-dhcpd/metadata.py

@@ -52,14 +52,13 @@ def subnets(metadata):
             if 'mac' in network_conf
     )
 
-    for id, (network_name, network_conf) in enumerate(sorted(metadata.get('network').items())):
+    for network_name, network_conf in metadata.get('network').items():
         dhcp_server_config = network_conf.get('dhcp_server_config', None)
 
         if dhcp_server_config:
             _network = ip_network(dhcp_server_config['subnet'])
 
             subnet4.add(hashable({
-                'id': id + 1,
                 'subnet': dhcp_server_config['subnet'],
                 'pools': [
                     {

nodes/home.openhab.py

@@ -0,0 +1,52 @@
+{
+    'dummy': True,
+    'hostname': '10.0.0.17',
+    'groups': [
+        'autologin',
+        'backup',
+        'debian-12',
+        'home',
+        'monitored',
+        'raspberry-pi',
+        'webserver',
+    ],
+    'bundles': [
+        'build-agent',
+        'java',
+        'openhab',
+        'systemd-swap',
+        'zfs',
+    ],
+    'metadata': {
+        'id': '34199b24-4621-42f4-85ae-ec354f9c43e6',
+        'network': {
+            'internal': {
+                'interface': 'eth0',
+                'ipv4': '10.0.0.17/24',
+                'gateway4': '10.0.0.1',
+            },
+        },
+        'nginx': {
+            'vhosts': {
+                'openhab.ckn.li': {
+                    'content': 'nginx/proxy_pass.conf',
+                    'context': {
+                        'target': 'http://localhost:8080',
+                    },
+                },
+            },
+        },
+        'java': {
+            'version': 17,
+        },
+        'zfs': {
+            'pools': {
+                'tank': {
+                    'devices': [
+                        '/dev/mmcblk1p3',
+                    ],
+                },
+            },
+        },
+    },
+}

nodes/home.router.py

@@ -2,7 +2,7 @@
     'hostname': '10.0.0.1',
     'groups': [
         'autologin',
-        'debian-13',
+        'debian-12',
         'hardware',
         'home',
         'monitored',
@@ -81,6 +81,7 @@
             's2s': {
                 'htz.mails': {
                     'allowed_ips': [
+                        '10.0.10.0/24',
                         '10.0.10.0/24',
                         #'192.168.179.0/24', # while raspi at home
                         '10.0.227.0/24', # mseibert.freescout

nodes/home.server.py

@@ -55,10 +55,10 @@
                     'node': 'home.server',
                     'target': 'x86_64-unknown-linux-gnu',
                 },
-                # 'arm64': {
+                'arm64': {
-                #     'node': 'home.openhab',
+                    'node': 'home.openhab',
-                #     'target': 'aarch64-unknown-linux-gnu',
+                    'target': 'aarch64-unknown-linux-gnu',
-                # },
+                },
             },
             'download_server': 'htz.mails',
         },