home.router: sort metadata

This commit is contained in:
Franzi 2020-12-06 19:52:32 +01:00
parent 1a56b7d328
commit 8a1a1bd8fd
Signed by: kunsi
GPG key ID: 12E3D2136B818350

View file

@ -3,12 +3,12 @@ from bundlewrap.metadata import atomic
nodes['home.router'] = { nodes['home.router'] = {
'hostname': '172.19.138.1', 'hostname': '172.19.138.1',
'bundles': { 'bundles': {
'dhcpd',
'iptables', 'iptables',
'netdata', 'netdata',
'nginx', 'nginx',
'pppd', 'pppd',
'radvd', 'radvd',
'dhcpd',
'vnstat', 'vnstat',
'wide-dhcp6c', 'wide-dhcp6c',
'wireguard', 'wireguard',
@ -42,6 +42,24 @@ nodes['home.router'] = {
# day. # day.
'restart_pppd': '23 2 * * * root systemctl restart pppoe', 'restart_pppd': '23 2 * * * root systemctl restart pppoe',
}, },
'dhcpd': {
'subnets': {
'home': {
'subnet': '172.19.138.0',
'netmask': '255.255.255.0',
'range_lower': '172.19.138.100',
'range_higher': '172.19.138.250',
'interface': 'enp1s0.42',
'options': {
'routers': '172.19.138.1',
'domain-name-servers': '8.8.8.8, 8.8.4.4',
'domain-name': 'franzi-home.kunbox.net',
'broadcast-address': '172.19.138.255',
'subnet-mask': '255.255.255.0',
},
},
},
},
'iptables': { 'iptables': {
'custom_rules': [ 'custom_rules': [
# This is a router. Allow forwarding traffic for all internal networks. # This is a router. Allow forwarding traffic for all internal networks.
@ -90,24 +108,6 @@ nodes['home.router'] = {
'password': vault.decrypt('encrypt$gAAAAABfr8Cq5M1hweeJTQAl0dLhFntdlw-QnkIYUQpY-_ycODVWOpyeAwjwOgWLSdsdXIUvqcoiXPZPV-BE12p5C42NGnj9r7sKYpoGz8xfuGIk6haMa2g='), 'password': vault.decrypt('encrypt$gAAAAABfr8Cq5M1hweeJTQAl0dLhFntdlw-QnkIYUQpY-_ycODVWOpyeAwjwOgWLSdsdXIUvqcoiXPZPV-BE12p5C42NGnj9r7sKYpoGz8xfuGIk6haMa2g='),
}, },
}, },
'dhcpd': {
'subnets': {
'home': {
'subnet': '172.19.138.0',
'netmask': '255.255.255.0',
'range_lower': '172.19.138.100',
'range_higher': '172.19.138.250',
'interface': 'enp1s0.42',
'options': {
'routers': '172.19.138.1',
'domain-name-servers': '8.8.8.8, 8.8.4.4',
'domain-name': 'franzi-home.kunbox.net',
'broadcast-address': '172.19.138.255',
'subnet-mask': '255.255.255.0',
},
},
},
},
'users': { 'users': {
'f2k1de': { 'f2k1de': {
'ssh_pubkey': { 'ssh_pubkey': {