wip

bundles/proxmox-ve/items.py

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,98 @@
+defaults = {
+    'apt': {
+        'packages': {
+            'linux-image-amd64': {
+                'installed': False,
+            },
+            'proxmox-default-kernel': {},
+            # after reboot
+            'proxmox-ve': {},
+            'postfix': {},
+            'open-iscsi': {},
+            'chrony': {},
+            'os-prober': {
+                'installed': False,
+            },
+        },
+        '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

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

bundles/yourls/items.py

@@ -4,6 +4,13 @@ directories = {
         'group': 'www-data',
         'mode': '0755',
     },
+
+    # FIXME:
+    '/var/www/certbot': {
+        'owner': 'www-data',
+        'group': 'www-data',
+        'mode': '0755',
+    }
 }
 
 git_deploy = {
@@ -38,11 +45,4 @@ files = {
             'svc_systemd:nginx:restart',
         ],
     },
-
-    # FIXME:
-    '/var/www/certbot': {
-        'owner': 'www-data',
-        'group': 'www-data',
-        'mode': '0755',
-    }
 }

groups/os/debian-11.py

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

groups/os/debian-12-common.py

@@ -0,0 +1,26 @@
+{
+    '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

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

groups/os/debian-12.py

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

groups/os/linux.py

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

nodes/home.router.py

@@ -18,7 +18,7 @@
                 'interface': 'enx00e04c220682',
                 'ipv4': '10.0.99.126/24',
                 'gateway4': '10.0.99.1',
-                'vlans': {'iot', 'internet', 'guest', 'rolf', 'internal'},
+                'vlans': {'iot', 'internet', 'guest', 'rolf', 'internal', 'proxmox'},
             },
             'internal': {
                 'type': 'vlan',
@@ -37,6 +37,12 @@
                 '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

@@ -35,6 +35,7 @@
         #'tasmota-charge',
         'wol-waker',
         'zfs',
+        'proxmox-ve',
     ],
     'metadata': {
         'id': 'af96709e-b13f-4965-a588-ef2cd476437a',
@@ -47,7 +48,7 @@
         },
         'apt': {
             'packages': {
-                'firmware-realtek': {},
+                # 'firmware-realtek': {}, proxmox-ve incompatibility
             },
         },
         'build-server': {
@@ -124,6 +125,9 @@
                 'unsortable': 'SofortUpload/Unsortable',
             },
         },
+        'proxmox-ve': {
+            'domain': 'pve.ckn.li',
+        },
         'raspberrymatic-cert': {
             'domain': 'homematic.ckn.li',
             'node': 'home.homematic',

nodes/htz.mails.py

@@ -9,7 +9,6 @@
         'webserver',
         'dnsserver',
         'wordpress',
-        #'left4dead2',
     ],
     'bundles': [
         'bind-acme',
@@ -17,7 +16,6 @@
         'download-server',
         'islamicstate.eu',
         #'nginx-rtmps',
-        #'steam',
         'wireguard',
         'zfs',
     ],
@@ -54,6 +52,7 @@
                 'left4.me',
                 'elimu-kwanza.de',
                 'cronekorkn.de',
+                'direkt.oranienschule.de',
                 'foerderkreis.oranienschule-wiesbaden-wiki.de',
             },
         },
@@ -86,34 +85,6 @@
                 'domain': 'elimu-kwanza.de',
             },
         },
-        'left4dead2': {
-            'servers': {
-                'standard': {
-                    'port': 27020,
-                },
-                # 'standard-2': {
-                #     'port': 27021,
-                #     'workshop': {
-                #         #2256379828, # bhop detect
-                #     },
-                # },
-            },
-            'admins': {
-                'STEAM_1:0:12376499', # CroneKorkN ☮️UKRAINE❤
-                'STEAM_1:1:169960486', # *RED*
-                'STEAM_1:1:112940736', # Ðark-AnGeℓ❤
-                'STEAM_1:1:34263261', # Alekc
-                'STEAM_1:0:583132949', # Cat
-                'STEAM_1:0:610180592', # SonovaBeach
-                'STEAM_1:1:157619181', # Null
-            },
-            'workshop': {
-                214630948,
-                1229957234,
-                698857882,
-            },
-            'steamgroups': {'103582791467869287'},
-        },
         'letsencrypt': {
             'domains': {
                 'ckn.li': {},
@@ -224,6 +195,11 @@
                         '10.0.227.0/24',
                     ],
                 },
+                'mseibert.yourls': {
+                    'allowed_ips': [
+                        '10.0.228.0/24',
+                    ],
+                },
             },
             'clients': {
                 'macbook': {

nodes/mseibert.freescout.py

@@ -46,7 +46,6 @@
                         '10.0.2.0/24',
                         '10.0.9.0/24',
                         '10.0.10.0/24',
-                        '10.0.10.0/24',
                     ],
                 },
             },

nodes/mseibert.yourls.py

@@ -4,13 +4,13 @@
 {
     'hostname': '168.119.250.114',
     'groups': [
-        #'backup',
+        'backup',
         'debian-12',
-        #'monitored',
+        'monitored',
         'webserver',
     ],
     'bundles': [
-        #'wireguard',
+        'wireguard',
         'mariadb',
         'php',
         'yourls',
@@ -21,7 +21,7 @@
         'network': {
             'internal': {
                 'interface': 'ens10',
-                'ipv4': '10.0.227.4/24',
+                'ipv4': '10.0.228.2/24',
             },
             'external': {
                 'interface': 'eth0',
@@ -40,13 +40,26 @@
             },
         },
         # FIXME:
-        'overwrite_nameservers': [
+        # 'overwrite_nameservers': [
-            '8.8.8.8',
+        #     '8.8.8.8',
-        ],
+        # ],
         'vm': {
             'cores': 2,
             'ram': 4096,
         },
+        'wireguard': {
+            'my_ip': '172.30.0.239/32',
+            's2s': {
+                'htz.mails': {
+                    'allowed_ips': [
+                        '10.0.0.0/24',
+                        '10.0.2.0/24',
+                        '10.0.9.0/24',
+                        '10.0.10.0/24',
+                    ],
+                },
+            },
+        },
         'zfs': {
             'pools': {
                 'tank': {