diff --git a/nodes/home/router.py b/nodes/home/router.py index d7a7d20..740c3f0 100644 --- a/nodes/home/router.py +++ b/nodes/home/router.py @@ -16,16 +16,16 @@ nodes['home.router'] = { }, 'metadata': { 'interfaces': { - 'enp1s0.23': { - 'ips': { - '172.19.139.1/24', - }, - }, - 'enp1s0.42': { + 'enp1s0.1138': { 'ips': { '172.19.138.1/24', }, }, + 'enp1s0.1139': { + 'ips': { + '172.19.139.1/24', + }, + }, }, 'backups': { 'exclude_from_backups': True, @@ -47,18 +47,7 @@ nodes['home.router'] = { }, 'dhcpd': { 'subnets': { - 'enp1s0.23': { - 'range_lower': '172.19.139.200', - 'range_higher': '172.19.139.250', - 'subnet': '172.19.139.0/24', - 'options': { - 'broadcast-address': '172.19.139.255', - 'domain-name-servers': '172.19.139.1', - 'routers': '172.19.139.1', - 'subnet-mask': '255.255.255.0', - }, - }, - 'enp1s0.42': { + 'enp1s0.1138': { 'range_lower': '172.19.138.100', 'range_higher': '172.19.138.250', 'subnet': '172.19.138.0/24', @@ -71,6 +60,17 @@ nodes['home.router'] = { 'subnet-mask': '255.255.255.0', }, }, + 'enp1s0.1139': { + 'range_lower': '172.19.139.200', + 'range_higher': '172.19.139.250', + 'subnet': '172.19.139.0/24', + 'options': { + 'broadcast-address': '172.19.139.255', + 'domain-name-servers': '172.19.139.1', + 'routers': '172.19.139.1', + 'subnet-mask': '255.255.255.0', + }, + }, }, }, 'hosts': { @@ -118,8 +118,8 @@ nodes['home.router'] = { }, 'radvd': { 'interfaces': { - 'enp1s0.23': {}, - 'enp1s0.42': {}, + 'enp1s0.1138': {}, + 'enp1s0.1138': {}, }, }, 'postfix': { @@ -130,7 +130,7 @@ nodes['home.router'] = { 'pppd': { 'username': vault.decrypt('encrypt$gAAAAABfruZ5AZbgJ3mfMLWqIMx8o4bBRMJsDPD1jElh-vWN_gnhiuZVjrQ1-7Y6zDXNkxXiyhx8rxc2enmvo26axd7EBI8FqknCptXAPruVtDZrBCis4TE='), 'password': vault.decrypt('encrypt$gAAAAABfruaXEDkaFksFMU8g97ydWyJF8p2KcSDJJBlzaOLDsLL6oCDYjG1kMPVESOzqjn8ThtSht1uZDuMCstA-sATmLS-EWQ=='), - 'interface': 'enp1s0.100', + 'interface': 'enp1s0.7', 'dyndns': { 'domain': 'franzi-home.kunbox.net', 'url': 'https://ns-primary.kunbox.net/nic/update?hostname=franzi-home.kunbox.net&myip={ip}', @@ -138,8 +138,8 @@ nodes['home.router'] = { 'password': vault.decrypt('encrypt$gAAAAABfr8Cq5M1hweeJTQAl0dLhFntdlw-QnkIYUQpY-_ycODVWOpyeAwjwOgWLSdsdXIUvqcoiXPZPV-BE12p5C42NGnj9r7sKYpoGz8xfuGIk6haMa2g='), }, 'nftables-rules.d': { - 'inet filter forward iifname enp1s0.23 oif $INTERFACE accept', - 'inet filter forward iifname enp1s0.42 accept', + 'inet filter forward iifname enp1s0.1138 accept', + 'inet filter forward iifname enp1s0.1139 oif $INTERFACE accept', }, }, 'unbound': { @@ -161,7 +161,7 @@ nodes['home.router'] = { }, }, 'vnstat': { - 'interface': 'enp1s0.100', + 'interface': 'enp1s0.7', }, 'vm': { 'cpu': 2, @@ -170,8 +170,8 @@ nodes['home.router'] = { 'wide-dhcp6c': { 'source': 'ppp0', 'targets': { - 'enp1s0.23': '2', - 'enp1s0.42': '1', + 'enp1s0.1138': '1', + 'enp1s0.1139': '2', }, }, 'wireguard': {