bundles/ifupdown/items.py

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

bundles/mariadb/files/override.conf

@@ -0,0 +1,11 @@
+% for section, options in sorted(conf.items()):
+[${section}]
+% for key, value in sorted(options.items()):
+% if value is None:
+${key}
+% else:
+${key} = ${value}
+% endif
+% endfor
+
+% endfor

bundles/mariadb/items.py

@@ -10,6 +10,8 @@ directories = {
         'group': 'mysql',
         'needs': [
             'zfs_dataset:tank/mariadb',
+        ],
+        'needs': [
             'pkg_apt:mariadb-server',
             'pkg_apt:mariadb-client',
         ],
@@ -18,8 +20,10 @@ directories = {
 
 files = {
     '/etc/mysql/conf.d/override.conf': {
-        'content': repo.libs.ini.dumps(node.metadata.get('mariadb/conf')),
+        'context': {
-        'content_type': 'text',
+            'conf': node.metadata.get('mariadb/conf'),
+        },
+        'content_type': 'mako',
     },
 }
 

bundles/mariadb/metadata.py

@@ -3,12 +3,12 @@ defaults = {
         'packages': {
             'mariadb-server': {
                 'needs': {
-                    'zfs_dataset:tank/mariadb',
+                    #'zfs_dataset:tank/mariadb',
                 },
             },
             'mariadb-client': {
                 'needs': {
-                    'zfs_dataset:tank/mariadb',
+                    #'zfs_dataset:tank/mariadb',
                 },
             },
         },

bundles/network/metadata.py

@@ -36,7 +36,6 @@ 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():
@@ -95,5 +94,3 @@ def units(metadata):
             'units': units,
         }
     }
-    else:
-        return {}

bundles/proxmox-ve/items.py

@@ -1,21 +0,0 @@
-files = {
-    '/etc/apt/apt.conf.d/10pveapthook': {
-        'content_type': 'any',
-        'mode': '0644',
-    },
-    '/etc/apt/apt.conf.d/76pveconf': {
-        'content_type': 'any',
-        'mode': '0444',
-    },
-    '/etc/apt/apt.conf.d/76pveproxy': {
-        'content_type': 'any',
-        'mode': '0444',
-    },
-    '/etc/network/interfaces': {
-        'content_type': 'any',
-    },
-}
-
-symlinks['/etc/ssh/ssh_host_rsa_key.pub'] = {
-    'target': '/etc/ssh/ssh_host_managed_key.pub',
-}

bundles/proxmox-ve/metadata.py

@@ -1,99 +0,0 @@
-defaults = {
-    'apt': {
-        'packages': {
-            'linux-image-amd64': {
-                'installed': False,
-            },
-            'proxmox-default-kernel': {},
-            # after reboot
-            'proxmox-ve': {},
-            'postfix': {},
-            'open-iscsi': {},
-            'chrony': {},
-            'os-prober': {
-                'installed': False,
-            },
-            'dnsmasq-base': {},
-        },
-        'sources': {
-            'proxmox-ve': {
-                'options': {
-                    'aarch': 'amd64',
-                },
-                'urls': {
-                    'http://download.proxmox.com/debian/pve',
-                },
-                'suites': {
-                    '{codename}',
-                },
-                'components': {
-                    'pve-no-subscription',
-                },
-                'key': 'proxmox-ve-{codename}',
-            },
-        },
-    },
-    # 'nftables': {
-    #     'input': {
-    #         'tcp dport 8006 accept',
-    #     },
-    # },
-    'zfs': {
-        'datasets': {
-            'tank/proxmox-ve': {
-                'mountpoint': '/var/lib/proxmox-ve',
-            },
-        }
-    }
-}
-
-
-# @metadata_reactor.provides(
-#     'systemd',
-# )
-# def bridge(metadata):
-#     return {
-#         'systemd': {
-#             'units': {
-#                 # f'internal.network': {
-#                 #     'Network': {
-#                 #         'Bridge': 'br0',
-#                 #     },
-#                 # },
-#                 'br0.netdev': {
-#                     'NetDev': {
-#                         'Name': 'br0',
-#                         'Kind': 'bridge'
-#                     },
-#                 },
-#                 'br0.network': {
-#                     'Match': {
-#                         'Name': 'br0',
-#                     },
-#                     'Network': {
-#                         'Unmanaged': 'yes'
-#                     },
-#                 },
-#             },
-#         },
-#     }
-
-
-@metadata_reactor.provides(
-    'nginx/vhosts',
-)
-def nginx(metadata):
-    return {
-        'nginx': {
-            'has_websockets': True,
-            'vhosts': {
-                metadata.get('proxmox-ve/domain'): {
-                    'content': 'nginx/proxy_pass.conf',
-                    'context': {
-                        'target': 'https://localhost:8006',
-                        'websockets': True,
-                    }
-                },
-            },
-        },
-    }

bundles/systemd-networkd/items.py

@@ -21,3 +21,4 @@ directories = {
 svc_systemd = {
     'systemd-networkd.service': {},
 }
+

groups/os/debian-11.py

@@ -2,9 +2,6 @@
     'supergroups': [
         'debian',
     ],
-    'bundles': [
-        'systemd-networkd',
-    ],
     'metadata': {
         'php': {
             'version': '7.4',

groups/os/debian-12-common.py

@@ -1,26 +0,0 @@
-{
-    'metadata': {
-        'apt': {
-            'sources': {
-                'debian': {
-                    'components': {
-                        'non-free-firmware',
-                    },
-                },
-                'debian-security': {
-                    'components': {
-                        'non-free-firmware',
-                    },
-                },
-            },
-        },
-        'php': {
-            'version': '8.2',
-        },
-        'postgresql': {
-            'version': '15',
-        },
-        'os_codename': 'bookworm',
-    },
-    'os_version': (12,),
-}

groups/os/debian-12-pve.py

@@ -1,10 +0,0 @@
-{
-    'supergroups': [
-        'debian',
-        'debian-12-common',
-    ],
-    'bundles': [
-        'ifupdown',
-        'proxmox-ve',
-    ],
-}

groups/os/debian-12.py

@@ -1,10 +1,6 @@
 {
     'supergroups': [
         'debian',
-        'debian-12-common',
-    ],
-    'bundles': [
-        'systemd-networkd',
     ],
     'metadata': {
         'apt': {

groups/os/debian.py

@@ -47,14 +47,6 @@
                 'mtr-tiny': {},
             },
         },
-        # iperf3
-        'nftables': {
-            'input': {
-                'tcp dport 5201 accept',
-                'udp dport 5201 accept',
-            },
-        },
-
     },
     'os': 'debian',
     'pip_command': 'pip3',

groups/os/linux.py

@@ -14,6 +14,7 @@
         'system',
         'systemd',
         'systemd-journald',
+        'systemd-networkd',
         'systemd-mount',
         'systemd-timers',
         'users',

libs/ini.py

@@ -14,7 +14,7 @@ class CaseSensitiveConfigParser(ConfigParser):
         return value
 
 def parse(text):
-    config = CaseSensitiveConfigParser(allow_no_value=True)
+    config = CaseSensitiveConfigParser()
     config.read_string(text)
 
     return {
@@ -24,7 +24,8 @@ def parse(text):
 
 def dumps(dict):
     sorted_dict = json.loads(json.dumps(dict, sort_keys=True, cls=MetadataJSONEncoder))
-    parser = CaseSensitiveConfigParser(allow_no_value=True)
+
+    parser = CaseSensitiveConfigParser()
     parser.read_dict(sorted_dict)
 
     writable = Writable()

nodes/home.router.py

@@ -15,10 +15,10 @@
         'id': '1d6a43e5-858c-42f9-9c40-ab63d61c787c',
         'network': {
             'external': {
-                'interface': 'enp2s0',
+                'interface': 'enx00e04c220682',
                 'ipv4': '10.0.99.126/24',
                 'gateway4': '10.0.99.1',
-                'vlans': {'iot', 'internet', 'guest', 'rolf', 'internal', 'proxmox'},
+                'vlans': {'iot', 'internet', 'guest', 'rolf', 'internal'},
             },
             'internal': {
                 'type': 'vlan',
@@ -37,12 +37,6 @@
                 'id': 3,
                 'ipv4': '10.0.3.1/24',
             },
-            'proxmox': {
-                'type': 'vlan',
-                'id': 4,
-                'ipv4': '10.0.4.1/24',
-                'dhcp_server': True,
-            },
             'guest': {
                 'type': 'vlan',
                 'id': 9,

nodes/home.server.py

@@ -3,7 +3,7 @@
     'groups': [
         'autologin',
         'backup',
-        'debian-12-pve',
+        'debian-12',
         'home',
         'nextcloud',
         'monitored',
@@ -12,6 +12,7 @@
         'build-server',
     ],
     'bundles': [
+        'apcupsd',
         'build-agent',
         'crystal',
         'gitea',
@@ -31,6 +32,7 @@
         'systemd-swap',
         'twitch-clip-download',
         'raspberrymatic-cert',
+        #'tasmota-charge',
         'wol-waker',
         'zfs',
     ],
@@ -45,7 +47,7 @@
         },
         'apt': {
             'packages': {
-                # 'firmware-realtek': {}, proxmox-ve incompatibility
+                'firmware-realtek': {},
             },
         },
         'build-server': {
@@ -122,9 +124,6 @@
                 'unsortable': 'SofortUpload/Unsortable',
             },
         },
-        'proxmox-ve': {
-            'domain': 'pve.ckn.li',
-        },
         'raspberrymatic-cert': {
             'domain': 'homematic.ckn.li',
             'node': 'home.homematic',
@@ -153,6 +152,18 @@
             },
         },
         '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_',
         },