Compare commits

..

No commits in common. "17aa3d7e483c138de5632fe0a71de88f40890331" and "64029d2147ebd3283b78d066cf2497c1e4c5f186" have entirely different histories.

3 changed files with 10 additions and 17 deletions

View file

@ -15,7 +15,6 @@ svc_systemd = {
'needs': [ 'needs': [
'pkg_apt:kea-dhcp4-server', 'pkg_apt:kea-dhcp4-server',
'file:/etc/kea/kea-dhcp4.conf', 'file:/etc/kea/kea-dhcp4.conf',
'svc_systemd:systemd-networkd:restart',
], ],
}, },
} }

View file

@ -14,17 +14,16 @@
'metadata': { 'metadata': {
'id': '1d6a43e5-858c-42f9-9c40-ab63d61c787c', 'id': '1d6a43e5-858c-42f9-9c40-ab63d61c787c',
'network': { 'network': {
'external': { 'internal': {
'interface': 'eno1',
'ipv4': '10.0.0.1/24',
'vlans': {'iot', 'internet', 'guest'},
'dhcp_server': True,
},
'temp': {
'interface': 'enx00e04c220682', 'interface': 'enx00e04c220682',
'ipv4': '10.0.99.126/24', 'ipv4': '10.0.99.126/24',
'gateway4': '10.0.99.1', 'gateway4': '10.0.99.1',
'vlans': {'iot', 'internet', 'guest', 'rolf', 'internal'},
},
'internal': {
'type': 'vlan',
'id': 1,
'ipv4': '10.0.0.1/24',
'dhcp_server': True,
}, },
'iot': { 'iot': {
'type': 'vlan', 'type': 'vlan',
@ -43,12 +42,6 @@
'ipv4': '10.0.9.1/24', 'ipv4': '10.0.9.1/24',
'dhcp_server': True, 'dhcp_server': True,
}, },
'rolf': { # rolf local test
'type': 'vlan',
'id': 51,
'ipv4': '192.168.179.1/24',
'dhcp_server': True,
},
}, },
# 'nftables': { # 'nftables': {
# 'forward': { # 'forward': {
@ -75,7 +68,7 @@
'allowed_ips': [ 'allowed_ips': [
'10.0.10.0/24', '10.0.10.0/24',
'10.0.10.0/24', '10.0.10.0/24',
#'192.168.179.0/24', '192.168.179.0/24',
'10.0.227.0/24', # mseibert.freescout '10.0.227.0/24', # mseibert.freescout
], ],
}, },

View file

@ -1,4 +1,5 @@
{ {
'dummy': True,
'hostname': '192.168.179.20', 'hostname': '192.168.179.20',
'groups': [ 'groups': [
'debian-11', 'debian-11',
@ -9,7 +10,7 @@
'backup-freshness-check', 'backup-freshness-check',
'dm-crypt', 'dm-crypt',
'smartctl', 'smartctl',
#'wireguard', 'wireguard',
'zfs', 'zfs',
], ],
'metadata': { 'metadata': {