mainrouter: add mainswitch setup on eth1, route WAN via VLAN

Author: dezeroku

config/mainrouter/template-variables.yaml

@@ -39,9 +39,12 @@ bridge_config:
   # and two adapters connected
   # thus we get
   # eth0 for all the stuff (via tagged VLANs)
-  # eth1 for WAN
+  # eth1 for all the stuff (via tagged VLANs) and WAN (also tagged VLAN)
+  # Using br-lan as a bridge for also WAN sounds a bit hacky,
+  # but makes life easier for defining "normal" VLANs on multiple ports
   ports:
     - eth0
+    - eth1
   # TODO: do we need this?
   # This bridge won't ever be empty
   empty: true
@@ -57,6 +60,7 @@ networks:
       id: 99
       ports:
         - eth0:t*
+        - eth1:t
     broadcast_mdns: true
     dhcp:
       start: 100
@@ -65,7 +69,11 @@ networks:
 
   wan:
     proto: dhcp
-    device: eth1
+    device: br-lan
+    vlan:
+      id: 90
+      ports:
+        - eth1:t
     collect_dns_statistics: false
 
   guest:
@@ -78,6 +86,7 @@ networks:
       id: 20
       ports:
         - eth0:t
+        - eth1:t
     type: bridge
     dhcp:
       start: 100
@@ -101,6 +110,7 @@ networks:
       id: 30
       ports:
         - eth0:t
+        - eth1:t
     type: bridge
     # TODO: this is only added so home-assistant, IoT devices and homekit-hub can see each other
     broadcast_mdns: true
@@ -124,6 +134,7 @@ networks:
       id: 31
       ports:
         - eth0:t
+        - eth1:t
     type: bridge
     # TODO: this is only added so home-assistant, IoT devices and homekit-hub can see each other
     broadcast_mdns: true
@@ -149,6 +160,7 @@ networks:
       id: 40
       ports:
         - eth0:t
+        - eth1:t
     type: bridge
     # TODO: this is only added so home-assistant, IoT devices and homekit-hub can see each other
     broadcast_mdns: true
@@ -297,12 +309,17 @@ dhcp:
       ip: &homekit_homepod_one "192.168.1.11"
       dns: true
 
+    mainswitch:
+      # mac: 'XX:XX:XX:XX:XX:XX'
+      ip: "192.168.1.2"
+      dns: true
+
     aprouter:
       # mac: 'XX:XX:XX:XX:XX:XX'
       ip: "192.168.1.3"
       dns: true
 
-    mainswitch:
+    labswitch:
       # mac: 'XX:XX:XX:XX:XX:XX'
       ip: "192.168.1.4"
       dns: true