diff --git a/bundles/kea-dhcpd/metadata.py b/bundles/kea-dhcpd/metadata.py index a3676f2..d73b2a3 100644 --- a/bundles/kea-dhcpd/metadata.py +++ b/bundles/kea-dhcpd/metadata.py @@ -52,13 +52,14 @@ def subnets(metadata): if 'mac' in network_conf ) - for network_name, network_conf in metadata.get('network').items(): + for id, (network_name, network_conf) in enumerate(sorted(metadata.get('network').items())): dhcp_server_config = network_conf.get('dhcp_server_config', None) if dhcp_server_config: _network = ip_network(dhcp_server_config['subnet']) subnet4.add(hashable({ + 'id': id + 1, 'subnet': dhcp_server_config['subnet'], 'pools': [ { diff --git a/nodes/home.router.py b/nodes/home.router.py index c3eb346..7a4d53e 100644 --- a/nodes/home.router.py +++ b/nodes/home.router.py @@ -2,7 +2,7 @@ 'hostname': '10.0.0.1', 'groups': [ 'autologin', - 'debian-12', + 'debian-13', 'hardware', 'home', 'monitored', @@ -81,7 +81,6 @@ 's2s': { 'htz.mails': { 'allowed_ips': [ - '10.0.10.0/24', '10.0.10.0/24', #'192.168.179.0/24', # while raspi at home '10.0.227.0/24', # mseibert.freescout