z9-router(host): change vlan 54 to 55 and remove netwan move vlan 400 to netlan

2026-08-01 23:30:36 +02:00 · 2026-08-01 23:30:36 +02:00 · 2f8b38b6a1
commit 2f8b38b6a1
parent d2f91f2f28
9 changed files with 40 additions and 38 deletions
--- a/resources/z9/z9-router/systemd_networkd/00-netwan.link
+++ b/resources/z9/z9-router/systemd_networkd/00-netwan.link
@ -1,6 +0,0 @@
-[Match]
-MACAddress=BC:24:11:CF:65:57
-Type=ether
-
-[Link]
-Name=netwan
--- a/resources/z9/z9-router/systemd_networkd/10-netlan.55.netdev
+++ b/resources/z9/z9-router/systemd_networkd/10-netlan.55.netdev
@ -1,8 +1,8 @@
 [NetDev]
-Name=netlan.54
+Name=netlan.55
 Kind=vlan
 MACAddress=BC:24:11:D2:65:B4

 [VLAN]
-Id=54
+Id=55

--- a/resources/z9/z9-router/systemd_networkd/10-wg56.netdev
+++ b/resources/z9/z9-router/systemd_networkd/10-wg56.netdev
@ -1,7 +1,7 @@
 [NetDev]
 Description=Admin-Wireguard
 Kind=wireguard
-Name=wg55
+Name=wg56

 [WireGuard]
 ListenPort=51820
--- a/resources/z9/z9-router/systemd_networkd/20-netlan.network
+++ b/resources/z9/z9-router/systemd_networkd/20-netlan.network
@ -5,12 +5,33 @@ Name=netlan
 RequiredForOnline=no

 [Network]
-LinkLocalAddressing=no
+#LinkLocalAddressing=no
 DHCP=no
-IPv6AcceptRA=no
+#IPv6AcceptRA=no

 VLAN=netlan.51
 VLAN=netlan.52
 VLAN=netlan.53
-VLAN=netlan.54
+#VLAN=netlan.55
+VLAN=netwan.400
+
+#Description=Management
+
+# Masquerading done in nftables (nftables.conf).
+IPv6SendRA=yes
+
+[Address]
+Address=10.89.213.1/24
+
+[IPv6SendRA]
+UplinkInterface=netwan.400
+EmitDomains=true
+Domains=ccchh.net
+Managed=true
+
+[IPv6Prefix]
+Prefix=2a07:c481:1:36::/64
+Assign=true
+Token=static:::1
+

--- a/resources/z9/z9-router/systemd_networkd/20-netwan.network
+++ b/resources/z9/z9-router/systemd_networkd/20-netwan.network
@ -1,13 +0,0 @@
-[Match]
-Name=netwan
-
-[Link]
-RequiredForOnline=no
-
-[Network]
-LinkLocalAddressing=no
-DHCP=no
-IPv6AcceptRA=no
-
-VLAN=netwan.400
-
--- a/resources/z9/z9-router/systemd_networkd/20-wg56.network
+++ b/resources/z9/z9-router/systemd_networkd/20-wg56.network
@ -1,5 +1,5 @@
 [Match]
-Name=wg55
+Name=wg56

 [Network]
 Address=10.89.214.1/24
--- a/resources/z9/z9-router/systemd_networkd/21-netlan.55-management.network
+++ b/resources/z9/z9-router/systemd_networkd/21-netlan.55-management.network
@ -1,5 +1,5 @@
 [Match]
-Name=netlan.54
+Name=netlan.55
 Type=vlan

 [Link]