Index: nodes/CNodeSpoortje/wleiden.conf
===================================================================
--- nodes/CNodeSpoortje/wleiden.conf	(revision 8521)
+++ nodes/CNodeSpoortje/wleiden.conf	(revision 9093)
@@ -1,84 +1,65 @@
-#
-#  Read by /usr/local/sbin/wireless-up.pl
-#
 # config CNodeSpoortje
-$status='up';
-
-$release="5.0-RELEASE";
-
 $location="Openbare Bibliotheek t Spoortje, Bernardkade 38, 2316 RX, Leiden";
+$master_ip='172.18.52.1'; 
+$nodetype='CNode';
+$nodename='Spoortje';
+$release="8.2-RELEASE";
+$status='down';
 $X='94607';
 $Y='464635';
 
-$nodetype='CNode';
-$nodename='Spoortje';
-$master_ip='172.18.52.1'; 
-
-##########################
-$config{'ep0'}=sprintf <<EP0;
-COMMENT=Ethernet  
-TYPE=ethernet
-STATUS=up
-DESC=ethernet
-STATUS=up naar bibliotheek     #Airport : transparant
-SDESC=eth
-IP=172.18.52.65/28
-DHCP=70-78
-EP0
-
-#########################eerste wireless kaart#######################
-$config{'wi0'}=sprintf <<EW0;
-COMMENT=Omni
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap
 TYPE=wireless
 DESC=omni voor de buurt
 SDESC=omni
 MODE=master
-ESSID=ap-omni.spoortje.wleiden.net
-CHANNEL=1
+ESSID=ap-WirelessLeiden-Spoortje
+CHANNEL=3
 IP=$master_ip/26
 DHCP=10-60
-EW0
+ATH0
 
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Ethernet naar bibliotheek Airport transparant
+TYPE=ethernet
+STATUS=up
+DESC=2bieb
+STATUS=up 
+SDESC=2bieb
+IP=172.18.52.65/28
+DHCP=70-78
+VR0
 
-#########################tweede wireless kaart#######################
-$config{'wi1'}=sprintf <<EW1;
-TYPE=wireless
-DESC=Link naar Cetim2
-SDESC=2cetim2
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=link naar Som2
+TYPE=ethernet
+STATUS=up
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.17.140 /29
+DESC=bridge naar Som2
+SDESC=2som2
+DHCP=no
+ESSID=il-zo.som2.wleiden.net
+#CHANNEL=60
+MODE=bridge station
+NSIP=172.16.17.139/29
+NSMAC=
+VR1
 
-MODE=managed
-ESSID=il-no.cetim2.wleiden.net
-
-IP=172.16.8.30/30               
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=a-link naar Cetim1
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+STATUS=down
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.17.148/29
+DESC=naar CeTIM1 richting ZW
+SDESC=ncetim1
 DHCP=no
-EW1
-
-
-
-
-#########################derde wireless kaart#######################
-$config{'wi2'}=sprintf <<EW2;
-TYPE=wireless
-DESC=Link naar Roomburgh1
-SDESC=2roomburgh1
-
-MODE=managed
-ESSID=il-n.roomburgh1.wleiden.net
-
-IP=172.16.0.130/30               
-DHCP=no
-EW2
-
-
-#########################vierde wireless kaart#######################
-$config{'wi3'}=sprintf <<EW3;
-TYPE=wireless
-DESC=Link naar Som
-SDESC=2som
-
-MODE=managed
-ESSID=il-nw.som.wleiden.net
-
-IP=172.16.0.198/30               
-DHCP=no
-EW3
+ESSID=il-no.cetim1.wleiden.net
+NSIP=172.16.17.147
+NSMAC=
+#CHANNEL=140
+#mode 11a bridge station
+VR2