Index: nodes/CNodeKaag2/wleiden.conf
===================================================================
--- nodes/CNodeKaag2/wleiden.conf	(revision 8551)
+++ nodes/CNodeKaag2/wleiden.conf	(revision 8917)
@@ -1,33 +1,15 @@
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeKaag2
 
-$location="Jachtwerf Feadship (De Lent), Julianalaan 3, 2159 LA, Kaag (Eiland)";
+$location="Jachtwerf Feadship (Van Lent), Julianalaan 3, 2159 LA, Kaag (Eiland)";
 $master_ip='172.27.8.1';  
 $nodetype='CNode';
 $nodename='Kaag2';
-
-$status='up';
-
-$release="5.0-RELEASE";
-
-
-# edugis x,y 98420,470298
+$status='down';
+$release="8.2-RELEASE";
 $X='98420';
 $Y='470298';
 
-$config{'sis0'}=sprintf <<ED0;
-COMMENT=Ethernet
-TYPE=ethernet
-STATUS=up
-IP=172.27.8.65/26
-DESC=Ethernet naar sis0
-SDESC=2sis0
-DHCP=no
-ED0
-
-$config{'wi0'}=sprintf <<EW0;
+$config{'ath0'}=sprintf <<ATH0;
 COMMENT=Omni voor de buurt
 TYPE=wireless
@@ -35,30 +17,57 @@
 DESC=Omni voor de buurt
 SDESC=omni
-DHCP=no
 DHCP=10-60
 MODE=master
-ESSID=ap-omni.kaag2.wleiden.net
+ESSID=ap-WirelessLeiden-Kaag2
 CHANNEL=3
-EW0
+ATH0
 
-$config{'wi1'}=sprintf <<EW1;
-COMMENT=link naar UnigorN 
-TYPE=wireless
-IP=172.16.1.46/30
-DESC=Link naar unigorN 
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=link naar Watertoren
+TYPE=ethernet
+STATUS=up
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.16.28/29
+DHCP=no
+DESC=Link naar Watertoren1
+SDESC=2watertoren1
+MODE=station bridge
+ESSID=il-zw.watertoren1.wleiden.net
+CHANNEL=124
+NSMAC=
+NSIP=172.16.16.27/29
+VR0
+
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=link naar Kaag1
+TYPE=ethernet
+STATUS=up
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.17.65/29
+DHCP=no
+DESC=Link naar Kaag1
+SDESC=2kaag1
+MODE=ap bridge
+ESSID=il-z.kaag2.wleiden.net
+CHANNEL=
+NSMAC=
+NSIP=172.16.17.66/29
+VR1
+
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=link naar UnigorN
+TYPE=ethernet
+STATUS=up
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.17.76/29
+DHCP=no
+DESC=Link naar UnigorN
 SDESC=2unigorn
-MODE=managed
-ESSID=il-o.unigorn.wleiden.net
-DHCP=no
-EW1
+MODE=managed bridge
+ESSID=il-no.unigorn.wleiden.net
+CHANNEL=
+NSMAC=
+NSIP=172.16.17.75/29
+VR2
 
-$config{'wi1'}=sprintf <<EW2;
-COMMENT=link naar Roomburgh2
-TYPE=wireless
-IP=172.16.16.81/29
-DESC=Link naar Roomburgh2
-SDESC=2Roomburgh2
-MODE=managed
-ESSID=il-o.unigorn.wleiden.net
-DHCP=no
-EW2
+