diff --git a/nodes/home/router.py b/nodes/home/router.py index a287b35..66fce52 100644 --- a/nodes/home/router.py +++ b/nodes/home/router.py @@ -20,17 +20,13 @@ nodes['home.router'] = { 'enp1s0.1138': { 'ips': { '172.19.138.1/24', - 'fd90:2017:0:1138::1/64', + 'fe80::1/64', }, }, 'enp1s0.1139': { 'ips': { '172.19.139.1/24', - }, - }, - 'enp1s0.2000': { - 'ips': { - 'fd90:2017:0:2000::1/64', + 'fe80::1/64', }, }, }, @@ -88,13 +84,8 @@ nodes['home.router'] = { '50-router': [ 'ct state { related, established } accept', 'iifname enp1s0.1138 accept', - 'iifname enp1s0.2000 accept', 'ip6 nexthdr ipv6-icmp accept', 'tcp dport 22 accept', - - # TODO remove this once a better solution exists - 'udp dport 53 iifname enp1s0.1138 accept', - 'udp dport 53 iifname enp1s0.2000 accept', ], }, 'prerouting': { @@ -107,7 +98,6 @@ nodes['home.router'] = { 'restrict-to': { '172.19.136.0/25', '172.19.138.0/24', - 'fd90:2017::/32', }, 'vhosts': { 'vnstat': { @@ -120,13 +110,12 @@ nodes['home.router'] = { 'interfaces': { 'enp1s0.1138': { 'rdnss': { - 'fd90:2017:0:1138::1', + 'fe80::1', }, }, - 'enp1s0.1139': {}, - 'enp1s0.2000': { + 'enp1s0.1139': { 'rdnss': { - 'fd90:2017:0:2000::1', + 'fe80::1', }, }, }, @@ -134,7 +123,6 @@ nodes['home.router'] = { 'postfix': { 'mynetworks': { '172.19.138.0/24', - 'fd90:2017::/32', }, }, 'pppd': { @@ -152,9 +140,10 @@ nodes['home.router'] = { }, }, 'unbound': { + 'dns64': False, 'restrict-to': { '172.19.138.0/23', - 'fd90:2017::/32', + 'fe80::/64', }, }, 'users': { @@ -176,7 +165,6 @@ nodes['home.router'] = { 'targets': { 'enp1s0.1138': '1', 'enp1s0.1139': '2', - 'enp1s0.2000': '3', }, }, 'wireguard': {