Index: nodes/CNodeThomas/wleiden.conf
===================================================================
--- nodes/CNodeThomas/wleiden.conf	(revision 8768)
+++ nodes/CNodeThomas/wleiden.conf	(revision 8769)
@@ -1,5 +1,2 @@
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeThomas
@@ -8,82 +5,60 @@
 $nodetype='CNode';
 $nodename='Thomas';
-
-$release="5.0-RELEASE";
-
-
-$comment='Electronische schakelklok schakelt elke maandag- en vrijdagochtend om +/- 2:04  UTC gedurende 1 minuut uit.';
-
-$status='up';
-
-# edugis x,y 93510,463474
+$release="8.0-RELEASE";
+$status='down';
 $X='93510';
 $Y='463474';
 
-$config{'sis0'}=sprintf <<ED0;
-COMMENT=Ethernet
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap 
+TYPE=wireless
+IP=$master_ip/26
+DESC=AP voor de buurt
+SDESC=ap
+DHCP=10-60
+MODE=master
+ESSID=ap-WirelessLeiden-Thomas
+CHANNEL=4
+ATH0
+
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=local subnet
 TYPE=ethernet
 STATUS=up
 IP=172.17.48.65/29
-
 DESC=Ethernet naar Thomas
 SDESC=eth
+DHCP=67-70
+VR0
 
-DHCP=67-70
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=link naar Vosko1
+TYPE=ethernet
+STATUS=up
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.3.4/29
+DHCP=no
+DESC=Link naar Vosko1
+SDESC=2vosko1
+MODE=managed
+ESSID=il-zw.vosko1.wleiden.net
+CHANNEL=64
+NSMAC=00:15:6D:
+NSIP=172.16.3.3/29
+VR1
 
-
-ED0
-
-$config{'wi0'}=sprintf <<EW0;
-COMMENT=OMNI
-TYPE=wireless
-IP=$master_ip/26
-
-DESC=Omni voor de buurt
-SDESC=omni
-
-DHCP=10-60
-
-
-MODE=master
-ESSID=ap-omni.thomas.wleiden.net
-CHANNEL=4
-
-
-EW0
-
-
-$config{'wi1'}=sprintf <<EW1;
-TYPE=wireless
-IP=172.16.0.206/30
-DESC=Link naar Vosko2
-SDESC=2vosko2
-
-
-MODE=managed
-ESSID=il-zo.vosko2.wleiden.net
-CHANNEL=1
-
-
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=link naar IMI
+TYPE=ethernet
+STATUS=up
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.3.9/29
 DHCP=no
-
-EW1
-
-
-$config{'wi2'}=sprintf <<EW2;
-COMMENT=link naar IMI
-TYPE=wireless
-IP=172.16.0.82/30
 DESC=Link naar IMI
 SDESC=2imi
-
-
-MODE=managed
-ESSID=il-no.imi.wleiden.net
-CHANNEL=8
-
-
-DHCP=no
-
-EW2
-
-
+MODE=bridge ap
+ESSID=il-z.thomas.wleiden.net
+CHANNEL=112
+NSMAC=00:15:6D:
+NSIP=172.16.3.10/29
+VR2