Index: /nodes/Rick/wleiden.yaml
===================================================================
--- /nodes/Rick/wleiden.yaml	(revision 13902)
+++ /nodes/Rick/wleiden.yaml	(revision 13903)
@@ -46,6 +46,13 @@
   status     : "planned"
 
+iface_vr0:
+  comment    : "Uplink XS4ALL FTTH (VAS)"
+  ip         : "80.127.152.27/29"
+  sdesc      : "2external"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
 
-iface_ue0:
+iface_vr1_104:
   comment    : "Loco tegen het raam"
   parent     : "bridge0"
@@ -61,31 +68,21 @@
   status     : "up"
 
-
-iface_ue1:
-  comment    : "Link to Server"
-  ip         : "172.17.107.1/24"
-  sdesc      : "2druif"
+iface_vr1_102:
+  comment    : "Link naar JVC"
+  ip         : "172.16.6.116/29"
+  sdesc      : "2jvc"
+  mode       : "station-wds"
   type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-no.jvc.wleiden.net"
   dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.6.115/29"
+  ns_mac     : "00:27:22:11:fd:ed"
+  bridge_type: "NanoStation M5"
   status     : "up"
 
-iface_ue1_extra0:
-  comment    : "UniFi Cloud Key"
-  ip         : "172.17.107.10/24"
-  sdesc      : "2unifi"
-  type       : "eth"
-  dhcp       : False
-  status     : "up"
-
-iface_vr0:
-  comment    : "Uplink XS4ALL FTTH (VAS)"
-  ip         : "80.127.152.27/29"
-  sdesc      : "2external"
-  type       : "eth"
-  dhcp       : False
-  status     : "up"
-
-
-iface_vr1:
+iface_vr1_103:
   comment    : "Link naar Meerburgkerk"
   ip         : "172.16.3.100/29"
@@ -103,23 +100,5 @@
   status     : "up"
 
-
-iface_vr2:
-  comment    : "Link naar JVC"
-  ip         : "172.16.6.116/29"
-  sdesc      : "2jvc"
-  mode       : "station-wds"
-  type       : "eth"
-  extra_type : "eth2wifibridge"
-  channel    : "36"
-  ssid       : "il-no.jvc.wleiden.net"
-  dhcp       : False
-  compass    : "zw"
-  ns_ip      : "172.16.6.115/29"
-  ns_mac     : "00:27:22:11:fd:ed"
-  bridge_type: "NanoStation M5"
-  status     : "up"
-
-
-iface_vr2_alias0:
+iface_vr1_104:
   comment    : "Link naar Rick2"
   ip         : "172.16.6.124/29"
@@ -130,2 +109,28 @@
 
 
+
+iface_vr2:
+  comment    : "Link to Server"
+  ip         : "172.17.107.1/24"
+  sdesc      : "2druif"
+  type       : "eth"
+  dhcp       : "50-100"
+  status     : "up"
+
+iface_vr2_extra0:
+  comment    : "UniFi Cloud Key"
+  ip         : "172.17.107.10/24"
+  sdesc      : "2unifi"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr2_extra1:
+  comment    : "Access from private network Zwet"
+  ip         : "172.17.107.20/24"
+  sdesc      : "2routerZW"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
