diff options
| author | Asbjørn Sloth Tønnesen <asbjorn@labitat.dk> | 2025-04-27 18:33:01 +0000 |
|---|---|---|
| committer | Asbjørn Sloth Tønnesen <asbjorn@labitat.dk> | 2025-06-04 16:40:56 +0000 |
| commit | 8aa31bca2062824f92a54aa6758c7322685c86ab (patch) | |
| tree | c429e94bd97263c7f633f90cabd57e1198317723 /roles/space_server/templates | |
| parent | beea656c48726d1acfa62be31e7350b45bcb1a5a (diff) | |
| download | labitat-ansible-8aa31bca2062824f92a54aa6758c7322685c86ab.tar.gz labitat-ansible-8aa31bca2062824f92a54aa6758c7322685c86ab.tar.xz labitat-ansible-8aa31bca2062824f92a54aa6758c7322685c86ab.zip | |
space_server: networkd: change reamining networks to new prefixes
Signed-off-by: Asbjørn Sloth Tønnesen <asbjorn@labitat.dk>
Diffstat (limited to 'roles/space_server/templates')
| -rw-r--r-- | roles/space_server/templates/nftables.conf.j2 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/roles/space_server/templates/nftables.conf.j2 b/roles/space_server/templates/nftables.conf.j2 index 002a107..cccdc71 100644 --- a/roles/space_server/templates/nftables.conf.j2 +++ b/roles/space_server/templates/nftables.conf.j2 @@ -7,8 +7,8 @@ define jumbotron_ip6 = {{ local_hosts['jumbotron'].ipv6[0] }} # internal stuff define ext_if = wan -define ext_ip4 = 185.38.175.0 -define ext_ip6 = 2a01:4262:1ab:: +define ext_ip4 = 45.145.93.0 +define ext_ip6 = 2a00:fbe4:1ab:: define int_net4 = 10.42.0.0/16 define ext_net4 = { 185.38.175.0/24, 45.145.93.0/24 } define ext_net6 = { 2a01:4262:1ab::/48, 2a00:fbe4:1ab::/48 } @@ -22,26 +22,26 @@ define adm_net4 = 10.42.0.0/24 define wire_if = lan11 define wire_ip4 = 10.42.1.1 define wire_net4 = 10.42.1.0/24 -define wire_net6 = 2a01:4262:1ab:b::/64 +define wire_net6 = { 2a01:4262:1ab:b::/64, 2a00:fbe4:1ab:b::/64 } define priv_if = lan12 define priv_ip4 = 10.42.2.1 define priv_net4 = 10.42.2.0/24 -define priv_net6 = 2a01:4262:1ab:c::/64 +define priv_net6 = { 2a01:4262:1ab:c::/64, 2a00:fbe4:1ab:c::/64 } define free_if = lan13 define free_ip4 = 10.42.3.1 -define free_nat = 185.38.175.1 +define free_nat = 45.145.93.1 define free_net4 = 10.42.3.0/24 -define free_net6 = 2a01:4262:1ab:d::/64 +define free_net6 = { 2a01:4262:1ab:d::/64, 2a00:fbe4:1ab:d::/64 } define pass_if = lan14 define pass_ip4 = 10.42.4.1 define pass_net4 = 10.42.4.0/24 -define pass_net6 = 2a01:4262:1ab:e::/64 +define pass_net6 = { 2a01:4262:1ab:e::/64, 2a00:fbe4:1ab:e::/64 } define futu_if = lan15 -define futu_net6 = 2a01:4262:1ab:f::/64 +define futu_net6 = { 2a01:4262:1ab:f::/64, 2a00:fbe4:1ab:f::/64 } define nat64_if = nat64 define nat64_net4 = 10.42.128.0/17 @@ -49,13 +49,13 @@ define nat64_net4 = 10.42.128.0/17 define colo_if = { lan20, lan21 } define tor_if = lan25 -define tor_net4 = 185.38.175.128/28 -define tor_net6 = 2a01:4262:1ab:ffff::/64 +define tor_net4 = { 185.38.175.128/28, 45.145.93.128/28 } +define tor_net6 = { 2a01:4262:1ab:ffff::/64, 2a00:fbe4:1ab:ffff::/64 } define local_ip4 = { $ext_ip4, $adm_ip4, $wire_ip4, $priv_ip4, $free_ip4, $pass_ip4 } define local_ip6 = { $ext_ip6 } define local_net4 = { $ext_ip4, $free_nat, $int_net4 } -define local_net6 = 2a01:4262:1ab::/52 +define local_net6 = { 2a01:4262:1ab::/52, 2a00:fbe4:1ab::/52 } define avahi_ifs = { $wire_if, $priv_if, $pass_if } |