diff options
| author | Asbjørn Sloth Tønnesen <asbjorn@labitat.dk> | 2024-02-21 23:11:17 +0000 |
|---|---|---|
| committer | Emil Renner Berthing <esmil@labitat.dk> | 2024-02-22 21:05:10 +0100 |
| commit | ef8874abf3144238bb5c822dde430c9b014893e4 (patch) | |
| tree | 310b49e1cf0e35907c26d6b9d037d4ee6b581716 | |
| parent | b21d2a650cba4d3d4397e33e567de5887a33b9cd (diff) | |
| download | labitat-ansible-ef8874abf3144238bb5c822dde430c9b014893e4.tar.gz labitat-ansible-ef8874abf3144238bb5c822dde430c9b014893e4.tar.xz labitat-ansible-ef8874abf3144238bb5c822dde430c9b014893e4.zip | |
space_server: networkd: move Tor network to vlan 25
Signed-off-by: Asbjørn Sloth Tønnesen <asbjorn@labitat.dk>
| -rw-r--r-- | documentation/vlans.txt | 2 | ||||
| -rw-r--r-- | roles/space_server/files/networkd/10-bond0.network | 2 | ||||
| -rw-r--r-- | roles/space_server/files/networkd/10-lan25.netdev (renamed from roles/space_server/files/networkd/10-lan21.netdev) | 4 | ||||
| -rw-r--r-- | roles/space_server/files/networkd/10-lan25.network (renamed from roles/space_server/files/networkd/10-lan21.network) | 2 | ||||
| -rw-r--r-- | roles/space_server/templates/nftables.conf.j2 | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/documentation/vlans.txt b/documentation/vlans.txt index 5b3af4c..778a5ea 100644 --- a/documentation/vlans.txt +++ b/documentation/vlans.txt @@ -9,6 +9,6 @@ vlan 14 - wireless compat vlan 15 - wireless nat64 vlan 20 - Labicolo -vlan 21 - Tor network +vlan 25 - Tor network vlan 42 - LabIX vlan 3145 - LocIX Frankfurt diff --git a/roles/space_server/files/networkd/10-bond0.network b/roles/space_server/files/networkd/10-bond0.network index 86b6ae5..38c0e49 100644 --- a/roles/space_server/files/networkd/10-bond0.network +++ b/roles/space_server/files/networkd/10-bond0.network @@ -20,4 +20,4 @@ VLAN=lan13 VLAN=lan14 VLAN=lan15 VLAN=lan20 -VLAN=lan21 +VLAN=lan25 diff --git a/roles/space_server/files/networkd/10-lan21.netdev b/roles/space_server/files/networkd/10-lan25.netdev index 85a79c2..2b8f762 100644 --- a/roles/space_server/files/networkd/10-lan21.netdev +++ b/roles/space_server/files/networkd/10-lan25.netdev @@ -1,6 +1,6 @@ [NetDev] -Name=lan21 +Name=lan25 Kind=vlan [VLAN] -Id=21 +Id=25 diff --git a/roles/space_server/files/networkd/10-lan21.network b/roles/space_server/files/networkd/10-lan25.network index 7ac5b75..e77b459 100644 --- a/roles/space_server/files/networkd/10-lan21.network +++ b/roles/space_server/files/networkd/10-lan25.network @@ -1,5 +1,5 @@ [Match] -Name=lan21 +Name=lan25 [Link] ARP=yes diff --git a/roles/space_server/templates/nftables.conf.j2 b/roles/space_server/templates/nftables.conf.j2 index 6567315..d4fe277 100644 --- a/roles/space_server/templates/nftables.conf.j2 +++ b/roles/space_server/templates/nftables.conf.j2 @@ -48,7 +48,7 @@ define nat64_net4 = 10.42.128.0/17 define colo_if = lan20 -define tor_if = lan21 +define tor_if = lan25 define tor_net4 = 185.38.175.128/28 define tor_net6 = 2a01:4262:1ab:ffff::/64 |