diff --git a/bundles/bind/files/named.conf.options b/bundles/bind/files/named.conf.options index a17f44b..64fd17c 100644 --- a/bundles/bind/files/named.conf.options +++ b/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])} }; - allow-transfer { ${' '.join([f'{ip};' for ip in slave_ips])} }; + also-notify { ${' '.join(sorted(f'{ip};' for ip in slave_ips))} }; + allow-transfer { ${' '.join(sorted(f'{ip};' for ip in slave_ips))} }; % endif }; diff --git a/nodes/home.router.py b/nodes/home.router.py index f83ae67..94b94af 100644 --- a/nodes/home.router.py +++ b/nodes/home.router.py @@ -6,6 +6,7 @@ 'hardware', 'home', 'monitored', + #'dnsserver', ], 'bundles': [ 'kea-dhcpd', @@ -26,7 +27,7 @@ 'ipv4': '10.0.2.1/24', 'dhcp_server': True, }, - 'internet': { + 'external': { 'type': 'vlan', 'id': 3, 'ipv4': '10.0.99.126/24', @@ -51,16 +52,9 @@ 'dhcp_server': True, }, }, - # 'nftables': { - # 'forward': { - # # Drop DHCP client requests (UDP port 68) - # 'udp sport 68 drop', - # 'udp dport 68 drop', - - # # Drop DHCP server responses (UDP port 67) - # 'udp sport 67 drop', - # 'udp dport 67 drop', - # }, + # 'bind': { + # 'master_node': 'htz.mails', + # 'hostname': 'home.resolver.name', # }, 'sysctl': { 'net': { diff --git a/nodes/home.server.py b/nodes/home.server.py index 23076ee..16a8c6f 100644 --- a/nodes/home.server.py +++ b/nodes/home.server.py @@ -42,11 +42,6 @@ 'ipv4': '10.0.0.2/24', 'gateway4': '10.0.0.1', }, - 'old-internal': { - 'interface': 'enp42s0', - 'ipv4': '10.0.0.82/24', - 'gateway4': '10.0.0.1', - }, }, 'apt': { 'packages': { @@ -113,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==',