Index: /nodes/Meerburg/wleiden.yaml
===================================================================
--- /nodes/Meerburg/wleiden.yaml	(revision 14047)
+++ /nodes/Meerburg/wleiden.yaml	(revision 14051)
@@ -31,27 +31,43 @@
   type       : "11g"
   channel    : 6
-  ssid       : "WiFi-Leiden"
+  ssid       : "WiFi Leiden"
   dhcp       : "10-60"
   status     : "up"
 
+iface_bridge0:
+  comment    : "Access Points"
+  ip         : "172.17.27.1/24"
+  type       : "eth"
+  dhcp       : "10-240"
+  status     : "up"
 
-iface_ue0:
-  comment    : "Link naar JVC"
-  ip         : "172.16.4.244/29"
-  sdesc      : "2jvc"
-  mode       : "station-wds"
+
+iface_vr0_102:
+  comment    : "Uplink - unused"
+  status     : "down"
+  type       : "eth"
+  
+
+
+iface_vr0_103:
+  comment    : "Link naar Roomburgh1"
+  ip         : "172.16.5.73/29"
+  sdesc      : "2roomburgh1"
+  mode       : "ap-wds"
   type       : "eth"
   extra_type : "eth2wifibridge"
-  channel    : "60"
-  ssid       : "il-o.jvc.wleiden.net"
+  channel    : "128"
+  ssid       : "il-nw.meerburg.wleiden.net"
   dhcp       : False
-  compass    : "w"
-  ns_ip      : "172.16.4.243/29"
-  ns_mac     : "00:27:22:8a:3d:57"
+  compass    : "n"
+  ns_ip      : "172.16.5.74/29"
+  ns_mac     : "00:27:22:10:fd:ea"
   bridge_type: "NanoStation M5"
   status     : "up"
 
 
-iface_ue1:
+
+
+iface_vr0_104:
   comment    : "Link naar Meerburgkerk"
   ip         : "172.16.5.60/29"
@@ -70,17 +86,8 @@
 
 
-iface_vr0:
-  comment    : "Unused"
-  ip         : "192.168.178.20/24"
-  sdesc      : "2unused"
-  type       : "eth"
-  dhcp       : "client"
-  status     : "down"
-
-
-iface_vr1:
-  comment    : "Ethernet naar aps-switch"
-  ip         : "172.17.27.1/24"
-  sdesc      : "2aps"
+iface_vr0_105:
+  comment    : "AP Noord"
+  parent     : "bridge0"
+  sdesc      : "2ap-noord"
   mode       : "ap"
   type       : "eth"
@@ -88,5 +95,4 @@
   channel    : "1"
   ssid       : "WiFi-Leiden"
-  dhcp       : "10-254"
   compass    : "n"
   ns_ip      : "172.17.27.2/24"
@@ -96,11 +102,12 @@
 
 
-iface_vr1_extra0:
-  comment    : "AP zuid via switch"
-  ip         : "172.17.27.3/24"
+iface_vr1:
+  comment    : "AP Zuid"
+  parent     : "bridge0"
   type       : "eth"
   channel    : "1"
   ssid       : "WiFi-Leiden"
   compass    : "z"
+  ns_ip      : "172.17.27.3/24"
   ns_mac     : "00:15:6d:30:d2:b6"
   bridge_type: "NanoStation2"
@@ -109,18 +116,16 @@
 
 iface_vr2:
-  comment    : "Link naar Roomburgh1"
-  ip         : "172.16.5.73/29"
-  sdesc      : "2roomburgh1"
-  mode       : "ap-wds"
+  comment    : "Link naar JVC"
+  ip         : "172.16.4.244/29"
+  sdesc      : "2jvc"
+  mode       : "station-wds"
   type       : "eth"
   extra_type : "eth2wifibridge"
-  channel    : "128"
-  ssid       : "il-nw.meerburg.wleiden.net"
+  channel    : "60"
+  ssid       : "il-o.jvc.wleiden.net"
   dhcp       : False
-  compass    : "n"
-  ns_ip      : "172.16.5.74/29"
-  ns_mac     : "00:27:22:10:fd:ea"
+  compass    : "w"
+  ns_ip      : "172.16.4.243/29"
+  ns_mac     : "00:27:22:8a:3d:57"
   bridge_type: "NanoStation M5"
   status     : "up"
-
-