wip

bundles/ifupdown/items.py

@@ -0,0 +1,3 @@
+# svc_systemd = {
+#     'ifupdown.service': {},
+# }

bundles/network/metadata.py

@@ -36,6 +36,7 @@ def dhcp(metadata):
     'systemd/units',
 )
 def units(metadata):
+    if node.has_bundle('systemd-networkd'):
         units = {}
 
         for network_name, network_conf in metadata.get('network').items():
@@ -94,3 +95,5 @@ def units(metadata):
                 'units': units,
             }
         }
+    else:
+        return {}

bundles/proxmox-ve/metadata.py

@@ -13,6 +13,7 @@ defaults = {
             'os-prober': {
                 'installed': False,
             },
+            'dnsmasq-base': {},
         },
         'sources': {
             'proxmox-ve': {

bundles/systemd-networkd/items.py

@@ -1,6 +1,9 @@
 assert node.has_bundle('systemd')
 
 files = {
+    '/etc/network/interfaces': {
+        'delete': True,
+    },
     '/etc/resolv.conf': {
         'content_type': 'mako',
     },
@@ -18,9 +21,3 @@ directories = {
 svc_systemd = {
     'systemd-networkd.service': {},
 }
-
-
-if not node.has_bundle('proxmox-ve'):
-    files['/etc/network/interfaces'] = {
-        'delete': True,
-    }

groups/os/debian-12-pve.py

@@ -5,5 +5,6 @@
     ],
     'bundles': [
         'ifupdown',
+        'proxmox-ve',
     ],
 }

nodes/home.server.py

@@ -3,7 +3,7 @@
     'groups': [
         'autologin',
         'backup',
-        'debian-12',
+        'debian-12-pve',
         'home',
         'nextcloud',
         'monitored',
@@ -32,10 +32,8 @@
         'systemd-swap',
         'twitch-clip-download',
         'raspberrymatic-cert',
-        #'tasmota-charge',
         'wol-waker',
         'zfs',
-        'proxmox-ve',
     ],
     'metadata': {
         'id': 'af96709e-b13f-4965-a588-ef2cd476437a',
@@ -156,18 +154,6 @@
             },
         },
         'systemd-swap': 4_000_000_000,
-        'tasmota-charge': {
-            'phone': {
-                'ip': '10.0.0.175',
-                'user': 'u0_a233',
-                'password': 'november',
-            },
-            'plug': {
-                'ip': '10.0.2.115',
-                'min': 45,
-                'max': 70,
-            },
-        },
         'twitch-clip-download': {
             'channel_name': 'cronekorkn_',
         },