bundles/bind/files/named.conf.options

@@ -10,7 +10,7 @@ options {
 
 % if type == 'master':
   notify yes;
-  also-notify { ${' '.join([f'{ip};' for ip in slave_ips])} };
+  also-notify { ${' '.join(sorted(f'{ip};' for ip in slave_ips))} };
-  allow-transfer { ${' '.join([f'{ip};' for ip in slave_ips])} };
+  allow-transfer { ${' '.join(sorted(f'{ip};' for ip in slave_ips))} };
 % endif
 };

bundles/proxmox-ve/items.py

@@ -9,7 +9,7 @@ files = {
     },
     '/etc/apt/apt.conf.d/76pveproxy': {
         'content_type': 'any',
-        'mode': '0444',
+        'mode': '0644',
     },
     '/etc/network/interfaces': {
         'content_type': 'any',

bundles/routeros/README.md

@@ -0,0 +1,8 @@
+- reset (hold reset for 5-10 seconds, until user light starts flashing)
+- open webinterface under 192.168.88.1
+- set password
+- vlans need to be configured and an additional ip needs to be assined to a vlan which es later accessible preferably through an untagged port
+- for example add 10.0.0.62/24 to "home" vlan
+- this happens on the first apply
+- when vlan filering gets enabled, the apply freezes and the switch is no longer available under the old ip
+- now that filtering is active, the switch is available under its new ip, because now you dont speak to the bridge anymore, where the old ip was residing, but to the vlan interface, where the new ip is residing

bundles/routeros/items.py

@@ -1,3 +1,122 @@
+routeros['/ip/dns'] = {
+    'servers': '8.8.8.8',
+}
+
 routeros['/system/identity'] = {
     'name': node.name,
 }
+
+# for service in (
+#     'api-ssl',  # slow :(
+#     'ftp',  # we can download files via HTTP
+#     'telnet',
+#     'www-ssl',  # slow :(
+#     'winbox',
+# ):
+#     routeros[f'/ip/service?name={service}'] = {
+#         'disabled': True,
+#     }
+
+# LOGGING_TOPICS = (
+#     'critical',
+#     'error',
+#     'info',
+#     'stp',
+#     'warning',
+# )
+# for topic in LOGGING_TOPICS:
+#     routeros[f'/system/logging?action=memory&topics={topic}'] = {}
+
+# routeros['/snmp'] = {
+#     'enabled': True,
+# }
+# routeros['/snmp/community?name=public'] = {
+#     'addresses': '0.0.0.0/0',
+#     'disabled': False,
+#     'read-access': True,
+#     'write-access': False,
+# }
+
+# routeros['/system/clock'] = {
+#     'time-zone-autodetect': False,
+#     'time-zone-name': 'UTC',
+# }
+
+# routeros['/ip/neighbor/discovery-settings'] = {
+#     'protocol': 'cdp,lldp,mndp',
+# }
+
+# routeros['/ip/route?dst-address=0.0.0.0/0'] = {
+#     'gateway': node.metadata.get('routeros/gateway'),
+# }
+
+for vlan_name, vlan_id in node.metadata.get('routeros/vlans').items():
+    routeros[f'/interface/vlan?name={vlan_name}'] = {
+        'vlan-id': vlan_id,
+        'interface': 'bridge',
+        'tags': {
+            'routeros-vlan',
+        },
+        'needs': {
+            #'routeros:/interface/bridge?name=bridge',
+        },
+    }
+
+    routeros[f"/interface/bridge/vlan?vlan-ids={vlan_id}&dynamic=false"] = {
+        'bridge': 'bridge',
+        'untagged': sorted(node.metadata.get(f'routeros/vlan_ports/{vlan_name}/untagged')),
+        'tagged': sorted(node.metadata.get(f'routeros/vlan_ports/{vlan_name}/tagged')),
+        '_comment': vlan_name,
+        'tags': {
+            'routeros-vlan-ports',
+        },
+        'needs': {
+            'tag:routeros-vlan',
+        },
+    }
+
+# create IPs
+for ip, ip_conf in node.metadata.get('routeros/ips').items():
+    routeros[f'/ip/address?address={ip}'] = {
+        'interface': ip_conf['interface'],
+        'tags': {
+            'routeros-ip',
+        },
+        'needs': {
+            'tag:routeros-vlan',
+        },
+    }
+
+routeros['/interface/bridge?name=bridge'] = {
+    'vlan-filtering': True, # ENABLE AFTER PORT VLANS ARE SET UP
+    'igmp-snooping': False,
+    'priority': node.metadata.get('routeros/bridge_priority'),
+    'protocol-mode': 'rstp',
+    'needs': {
+        'tag:routeros-vlan',
+        'tag:routeros-vlan-ports',
+        'tag:routeros-ip',
+    },
+}
+
+# purge unused vlans
+routeros['/interface/vlan'] = {
+    'purge': {
+        'id-by': 'name',
+    },
+    'needed_by': {
+        'tag:routeros-vlan',
+    }
+}
+
+routeros['/interface/bridge/vlan'] = {
+    'purge': {
+        'id-by': 'vlan-ids',
+        'keep': {
+            'dynamic': True,
+        },
+    },
+    'needed_by': {
+        'tag:routeros-vlan',
+    }
+}

bundles/routeros/metadata.py

@@ -0,0 +1,26 @@
+defaults = {}
+
+
+@metadata_reactor.provides(
+    'routeros/vlan_ports',
+)
+def routeros__(metadata):
+    return {
+        'routeros': {
+            'vlan_ports': {
+                vlan_name: {
+                    'untagged': {
+                        port_name
+                            for port_name, port_conf in metadata.get('routeros/ports').items()
+                            if vlan_name == metadata.get(f'routeros/vlan_groups/{port_conf["vlan_group"]}/untagged')
+                    },
+                    'tagged': {
+                        port_name
+                            for port_name, port_conf in metadata.get('routeros/ports').items()
+                            if vlan_name in metadata.get(f'routeros/vlan_groups/{port_conf["vlan_group"]}/tagged')
+                    },
+                }
+                        for vlan_name in metadata.get('routeros/vlans').keys()
+            },
+        },
+    }

groups/os/routeros.py

@@ -9,6 +9,36 @@
         'routeros',
     ],
     'metadata': {
+        'routeros': {
+            'gateway': '10.0.0.1',
+            'bridge_priority': '0x8000',
+            'ports': {},
+            'vlans': {
+                'home': '1',
+                'iot': '2',
+                'internet': '3',
+                'proxmox': '4',
+                'gast': '9',
+                'rolf': '51',
+            },
+            'vlan_groups': {
+                'infra': {
+                    'untagged': 'home',
+                    'tagged': {
+                        'iot',
+                        'internet',
+                        'proxmox',
+                        'gast',
+                        'rolf',
+                    },
+                },
+                'internet': {
+                    'untagged': 'internet',
+                    'tagged': set(),
+                },
+            },
+            'vlan_ports': {},
+        },
     },
     'os': 'routeros',
 }

nodes/home.rack-switch-10g.py

@@ -1,10 +0,0 @@
-{
-    'hostname': '10.0.0.63',
-    'password': '!decrypt:encrypt$gAAAAABoYFUx2faf18aV3rzNNuBA-4xZ22LQJ2HinpgsjkoTQS_l2TbmDtiAZI1jt-kWfTZ48d5_UPX-VDmY9qb4Sgn2Iz7Yee3CrB4hl85TyutilukTIP8=',
-    'groups': [
-        'routeros',
-    ],
-    'metadata': {
-        'id': '26eca3f1-975e-426f-bd7d-e2a1ef36519e',
-    },
-}

nodes/home.router.py

@@ -6,6 +6,7 @@
         'hardware',
         'home',
         'monitored',
+        #'dnsserver',
     ],
     'bundles': [
         'kea-dhcpd',
@@ -14,16 +15,10 @@
     'metadata': {
         'id': '1d6a43e5-858c-42f9-9c40-ab63d61c787c',
         'network': {
-            'external': {
-                'interface': 'enp2s0',
-                'ipv4': '10.0.99.126/24',
-                'gateway4': '10.0.99.1',
-                'vlans': {'iot', 'internet', 'guest', 'rolf', 'internal', 'proxmox'},
-            },
             'internal': {
-                'type': 'vlan',
+                'interface': 'enp1s0f0',
-                'id': 1,
                 'ipv4': '10.0.0.1/24',
+                'vlans': {'iot', 'internet', 'guest', 'rolf', 'proxmox'},
                 'dhcp_server': True,
             },
             'iot': {
@@ -32,10 +27,11 @@
                 'ipv4': '10.0.2.1/24',
                 'dhcp_server': True,
             },
-            'internet': {
+            'external': {
                 'type': 'vlan',
                 'id': 3,
-                'ipv4': '10.0.3.1/24',
+                'ipv4': '10.0.99.126/24',
+                'gateway4': '10.0.99.1',
             },
             'proxmox': {
                 'type': 'vlan',
@@ -56,16 +52,9 @@
                 'dhcp_server': True,
             },
         },
-        # 'nftables': {
+        # 'bind': {
-        #     'forward': {
+        #     'master_node': 'htz.mails',
-        #         # Drop DHCP client requests (UDP port 68)
+        #     'hostname': 'home.resolver.name',
-        #         'udp sport 68 drop',
-        #         'udp dport 68 drop',
-
-        #         # Drop DHCP server responses (UDP port 67)
-        #         'udp sport 67 drop',
-        #         'udp dport 67 drop',
-        #     },
         # },
         'sysctl': {
             'net': {

nodes/home.server.py

@@ -38,7 +38,7 @@
         'id': 'af96709e-b13f-4965-a588-ef2cd476437a',
         'network': {
             'internal': {
-                'interface': 'enp42s0',
+                'interface': 'enp43s0',
                 'ipv4': '10.0.0.2/24',
                 'gateway4': '10.0.0.1',
             },
@@ -108,7 +108,7 @@
         },
         'nextcloud': {
             'hostname': 'cloud.sublimity.de',
-            'version': '29.0.7',
+            'version': '29.0.16',
             'config': {
                 'instanceid': 'oci6dw1woodz',
                 'secret': '!decrypt:encrypt$gAAAAABj96CFynVtEgsje7173zjQAcY7xQG3uyf5cxE-sJAvhyPh_KUykTKdwnExc8NTDJ8RIGUmVfgC6or5crnYaggARPIEg5-Cb0xVdEPPZ3oZ01ImLmynLu3qXT9O8kVM-H21--OKeztMRn7bySsbXdWEGtETFQ==',

nodes/home.switch-rack-10g.py

@@ -0,0 +1,46 @@
+{
+    'hostname': '10.0.0.63',
+    'password': '!decrypt:encrypt$gAAAAABoYFUx2faf18aV3rzNNuBA-4xZ22LQJ2HinpgsjkoTQS_l2TbmDtiAZI1jt-kWfTZ48d5_UPX-VDmY9qb4Sgn2Iz7Yee3CrB4hl85TyutilukTIP8=',
+    'groups': [
+        'routeros',
+    ],
+    'metadata': {
+        'id': '26eca3f1-975e-426f-bd7d-e2a1ef36519e',
+        'routeros': {
+            'ips': {
+                '10.0.0.63/24': {
+                    'interface': 'home',
+                },
+            },
+            'ports': {
+                'sfp-sfpplus1': {
+                    'vlan_group': 'infra',
+                },
+                'sfp-sfpplus2': {
+                    'vlan_group': 'infra',
+                },
+                'sfp-sfpplus3': {
+                    'vlan_group': 'infra',
+                },
+                'sfp-sfpplus4': {
+                    'vlan_group': 'infra',
+                },
+                'sfp-sfpplus5': {
+                    'vlan_group': 'infra',
+                },
+                'sfp-sfpplus6': {
+                    'vlan_group': 'infra',
+                },
+                'sfp-sfpplus7': {
+                    'vlan_group': 'infra',
+                },
+                'sfp-sfpplus8': {
+                    'vlan_group': 'infra',
+                },
+                'ether1': {
+                    'vlan_group': 'infra',
+                },
+            },
+        },
+    },
+}

nodes/home.switch-vorratsraum-poe.py

@@ -0,0 +1,103 @@
+{
+    'hostname': '10.0.0.60',
+    'password': '!decrypt:encrypt$gAAAAABoYVzxzO0R_bnW3S3Ggiq2LCCAGaKtXToviGZjgIlH2NpL9ojO8aNlSPPcGTKbn5z5RxSxjOlL161U0Ctdf6Rns2e5I5p5TIcsQ7c9qnAiaV-Hhuw=',
+    'groups': [
+        'routeros',
+    ],
+    'metadata': {
+        'id': 'e6a24df7-eed1-404e-af78-15ebcbcc02a2',
+        'routeros': {
+            'ips': {
+                '10.0.0.60/24': {
+                    'interface': 'home',
+                },
+            },
+            'ports': {
+                'sfp-sfpplus1': {
+                    'vlan_group': 'infra',
+                },
+                'sfp-sfpplus2': {
+                    'vlan_group': 'infra',
+                },
+                'sfp-sfpplus3': {
+                    'vlan_group': 'infra',
+                },
+                'sfp-sfpplus4': {
+                    'vlan_group': 'infra',
+                },
+                'ether1': {
+                    'vlan_group': 'infra',
+                },
+                'ether2': {
+                    'vlan_group': 'infra',
+                },
+                'ether3': {
+                    'vlan_group': 'infra',
+                },
+                'ether4': {
+                    'vlan_group': 'internet',
+                },
+                'ether5': {
+                    'vlan_group': 'infra',
+                },
+                'ether6': {
+                    'vlan_group': 'infra',
+                },
+                'ether7': {
+                    'vlan_group': 'infra',
+                },
+                'ether8': {
+                    'vlan_group': 'infra',
+                },
+                'ether9': {
+                    'vlan_group': 'infra',
+                },
+                'ether10': {
+                    'vlan_group': 'infra',
+                },
+                'ether11': {
+                    'vlan_group': 'infra',
+                },
+                'ether12': {
+                    'vlan_group': 'infra',
+                },
+                'ether13': {
+                    'vlan_group': 'infra',
+                },
+                'ether14': {
+                    'vlan_group': 'infra',
+                },
+                'ether15': {
+                    'vlan_group': 'infra',
+                },
+                'ether16': {
+                    'vlan_group': 'infra',
+                },
+                'ether17': {
+                    'vlan_group': 'infra',
+                },
+                'ether18': {
+                    'vlan_group': 'infra',
+                },
+                'ether19': {
+                    'vlan_group': 'infra',
+                },
+                'ether20': {
+                    'vlan_group': 'infra',
+                },
+                'ether21': {
+                    'vlan_group': 'infra',
+                },
+                'ether22': {
+                    'vlan_group': 'infra',
+                },
+                'ether23': {
+                    'vlan_group': 'infra',
+                },
+                'ether24': {
+                    'vlan_group': 'infra',
+                },
+            },
+        },
+    },
+}

nodes/home.switch-wohnzimmer-10g.py

@@ -0,0 +1,34 @@
+{
+    'hostname': '10.0.0.62',
+    'password': '!decrypt:encrypt$gAAAAABoYFSyt2JAsdePXiHim1RdQwbarJedhAOE3XpS2rGMBx-F5eCWRCIyLU2g2ocUDUIDfgH3nBipUCkdcd0Bv4vbK-yqKmGSeSH7YXLYwq3ZWuCDsLM=',
+    'groups': [
+        'routeros',
+    ],
+    'metadata': {
+        'id': 'e6a24df7-eed1-404e-af78-15ebcbcc02a2',
+        'routeros': {
+            'ips': {
+                '10.0.0.62/24': {
+                    'interface': 'home',
+                },
+            },
+            'ports': {
+                'ether1': {
+                    'vlan_group': 'infra',
+                },
+                'ether2': {
+                    'vlan_group': 'infra',
+                },
+                'ether3': {
+                    'vlan_group': 'infra',
+                },
+                'ether4': {
+                    'vlan_group': 'infra',
+                },
+                'ether5': {
+                    'vlan_group': 'infra',
+                },
+            },
+        },
+    },
+}

nodes/home.wohnzimmer-switch-10g.py

@@ -1,10 +0,0 @@
-{
-    'hostname': '10.0.0.62',
-    'password': '!decrypt:encrypt$gAAAAABoYFSyt2JAsdePXiHim1RdQwbarJedhAOE3XpS2rGMBx-F5eCWRCIyLU2g2ocUDUIDfgH3nBipUCkdcd0Bv4vbK-yqKmGSeSH7YXLYwq3ZWuCDsLM=',
-    'groups': [
-        'routeros',
-    ],
-    'metadata': {
-        'id': 'e6a24df7-eed1-404e-af78-15ebcbcc02a2',
-    },
-}