Index: nodes/CNodeRoomburgh3/wleiden.conf
===================================================================
--- nodes/CNodeRoomburgh3/wleiden.conf	(revision 9703)
+++ nodes/CNodeRoomburgh3/wleiden.conf	(revision 9704)
@@ -55,29 +55,13 @@
 STATUS=down
 EXTRA_TYPE=eth2wifibridge
-IP=172.16.3.157/30
+IP=172.16.4.233/29
 DESC=ethernet
-STATUS=up to interlink noord-2
-SDESC=2Zijloever
+STATUS=down
+SDESC=2zijloever
 MODE=master
 ESSID=il-n.roomburgh3.wleiden.net
 CHANNEL=44
-NS_IP=192.168.1.20
+NS_IP=172.16.4.234/29
 NSMAC=00:15:6D:EA:F0:28
 VR2
 
-$config{'ue0'}=sprintf <<UE0;
-COMMENT=link to Kaag1 via Nanostation5
-TYPE=ethernet
-STATUS=down
-EXTRA_TYPE=eth2wifibridge
-IP=172.16.17.81/29
-DESC=ethernet
-STATUS=up to interlink noord-noord-oost
-SDESC=2kaag1
-MODE=ap bride
-ESSID=il-nno.roomburgh3.wleiden.net
-CHANNEL=140
-NS_IP=172.16.17.82/29
-NSMAC=
-UE0
-
Index: nodes/CNodeSOM1/wleiden.conf
===================================================================
--- nodes/CNodeSOM1/wleiden.conf	(revision 9703)
+++ nodes/CNodeSOM1/wleiden.conf	(revision 9704)
@@ -74,3 +74,13 @@
 VR20
 
+$config{'vr2:1'}=sprintf <<VR21;
+COMMENT=Link naar Zijloever
+TYPE=ethernet
+STATUS=down
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.4.225/29
+DESC=Link naar Zijloever
+SDESC=2zijloever
+DHCP=no
+VR21
 
Index: nodes/CNodeZijloever/wleiden.conf
===================================================================
--- nodes/CNodeZijloever/wleiden.conf	(revision 9703)
+++ nodes/CNodeZijloever/wleiden.conf	(revision 9704)
@@ -1,86 +1,82 @@
+# config CNodeZijloever
 #
-#
-#  Read by /usr/local/sbin/wireless-up.pl
-#
-# config CNodeZijloever
 $master_ip='172.19.0.1';  
 $nodetype='CNode';
 $nodename='Zijloever';
-$location='Wijksteunpunt Zijloever, Lage Rijndijk 129, 2315 JS, Leiden';
+$location='Zorgvoorziening Zijloever, Lage Rijndijk 129, 2315 JS, Leiden';
+$release="8.2-RELEASE";
 
-$release="5.0-RELEASE";
-
-
-$status='up';
+$status='down';
 
 $X='95274';
 $Y='464075';
 
-$config{'ep0'}=sprintf <<ED0;
+$ileiden="yes";
+
+$config{'ue0'}=sprintf <<UE0;
 COMMENT=Ethernet
 TYPE=ethernet
-STATUS=up
+STATUS=down
 IP=172.19.0.65/28
-
 DESC=Ethernet naar Zijloever
 SDESC=eth
+DHCP=no
+UE0
 
-DHCP=no
-
-
-ED0
-
-
-
-$config{'wi0'}=sprintf <<EW0;
-COMMENT=omni
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap
 TYPE=wireless
 IP=$master_ip/26
+DESC=ap
+SDESC=ap
+DHCP=10-60
+MODE=master
+ESSID=ap-WirelessLeiden-Zijloever
+CHANNEL=8
+ATH0
 
-DESC=omni
-SDESC=no
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=link naar SOM1
+TYPE=ethernet
+IP=172.16.4.228/29
+DESC=Link naar SOM1 
+SDESC=2som1
+STATUS=down
+MODE=bridge station
+ESSID=il-z.som1.wleiden.net
+CHANNEL=52
+NSIP=172.16.4.227/29
+NSMAC=
+DHCP=no
+VR0
 
-DHCP=10-60
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=link naar Roomburgh3
+TYPE=ethernet
+IP=172.16.4.236/29
+DESC=Link naar Roomburgh3 
+SDESC=2roomburgh3
+STATUS=down
+MODE=bridge station
+ESSID=il-n.roomburgh3.wleiden.net
+CHANNEL=44
+NSIP=172.16.4.235/29
+NSMAC=
+DHCP=no
+VR1
 
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=link naar TBD
+TYPE=ethernet
+IP=172.16.4.241/29
+DESC=Link naar TBD 
+SDESC=2tbd
+STATUS=down
+MODE=bridge ap
+ESSID=il-o.zijloever.wleiden.net
+CHANNEL=100
+NSIP=172.16.4.242/29
+NSMAC=
+DHCP=no
+VR2
 
-MODE=master
-ESSID=ap-omni.zijloever.wleiden.net
-CHANNEL=11
-
-
-EW0
-
-$config{'wi1'}=sprintf <<EW1;
-COMMENT=link naar SOM
-TYPE=wireless
-IP=172.16.1.62/30
-DESC=Link naar SOM 
-SDESC=2SOM
-
-
-MODE=managed
-ESSID=il-z.som.wleiden.net
-CHANNEL=5
-
-
-DHCP=no
-
-EW1
-
-$config{'wi2'}=sprintf <<EW2;
-COMMENT=link naar Roomburgh1
-TYPE=wireless
-IP=172.16.0.230/30
-DESC=Link naar Roomburgh1 
-SDESC=2roomburgh1
-
-MODE=managed
-ESSID=il-n.roomburgh1.wleiden.net
-
-CHANNEL=3
-
-
-DHCP=no
-
-EW2
-