Index: /nodes/CNodeCeTIM1/wleiden.conf
===================================================================
--- /nodes/CNodeCeTIM1/wleiden.conf	(revision 9081)
+++ /nodes/CNodeCeTIM1/wleiden.conf	(revision 9093)
@@ -50,35 +50,16 @@
 STATUS=down
 EXTRA_TYPE=eth2wifibridge
-IP=172.16.3.1/30
-DESC=CeTIM richting NO
-SDESC=NScetim1-n
+IP=172.16.17.145/29
+DESC=a-Link naar Spoortje
+SDESC=a2spoortje
 DHCP=no
 ESSID=il-no.cetim1.wleiden.net
 CHANNEL=140
-#mode 11a bridge master
+NSIP=172.16.17.146
+NSMAC=
+MODE=bridge master
 VR2
-
+  
 $config{'vr2:0'}=sprintf <<VR20;
-COMMENT=a-link Houtmarkt
-TYPE=ethernet
-STATUS=up
-EXTRA_TYPE=eth2wifibridge
-IP=172.16.0.41/30
-DESC=a-Link naar Houtmarkt
-SDESC=a2houtmarkt
-NSIP=172.16.16.98
-VR20
-
-$config{'vr2:1'}=sprintf <<VR21;
-COMMENT=a-link Spoortje
-TYPE=ethernet
-STATUS=up
-EXTRA_TYPE=eth2wifibridge
-IP=172.16.8.29/30
-DESC=a-Link naar Spoortje
-SDESC=a2spoortje
-VR21
-   
-$config{'vr2:2'}=sprintf <<VR20;
 COMMENT=a-link watertoren
 TYPE=ethernet
Index: /nodes/CNodeHoutmarkt/wleiden.conf
===================================================================
--- /nodes/CNodeHoutmarkt/wleiden.conf	(revision 9081)
+++ /nodes/CNodeHoutmarkt/wleiden.conf	(revision 9093)
@@ -1,3 +1,2 @@
-#
 # config CNodeHoutmarkt
 $location="Speciale Basisschool Vuurvogel, Houtmarkt 36, 2312 PZ, Leiden";
@@ -6,5 +5,5 @@
 $nodename='Houtmarkt';
 $release="8.2-RELEASE";
-$status='up';
+$status='down';
 $X='94200';
 $Y='464302';
@@ -49,17 +48,17 @@
 
 $config{'vr1'}=sprintf <<VR1;
-COMMENT=a-link naar Cetim1
+COMMENT=a-link naar Vosko2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
 STATUS=down
 EXTRA_TYPE=eth2wifibridge
-IP=172.16.0.42/30
-DESC=naar CeTIM1 richting ZW
-SDESC=ncetim1
+IP=172.16.17.164/29
+DESC=naar Vosko2 richting ZW
+SDESC=nvosko2
 DHCP=no
-ESSID=il-no.cetim1.wleiden.net
-NSIP=
+ESSID=il-no.vosko2.wleiden.net
+NSIP=172.16.17.163
 NSMAC=
-#CHANNEL=140
+#CHANNEL=44
 #mode 11a bridge station
 VR1
@@ -76,4 +75,5 @@
 ESSID=ap-WirelessLeiden-Houtmarkt2
 DHCP=140-190
+CHANNEL=8
 BulletIP=172.19.8.130/29
 BulletMAC=
Index: /nodes/CNodeSOM2/wleiden.conf
===================================================================
--- /nodes/CNodeSOM2/wleiden.conf	(revision 9081)
+++ /nodes/CNodeSOM2/wleiden.conf	(revision 9093)
@@ -116,7 +116,23 @@
 ESSID=il-nw.graficall.wleiden.net
 CHANNEL=60
+#IP=172.16.17.129/29
+#MODE=ap station
+#ESSID=il-zo.som2.wleiden.net
+#CHANNEL=60
+#NSIP=172.16.17.130/29
 NSMAC=
 VR2
 
+#$config{'vr2:0'}=sprintf <<VR20;
+#COMMENT=link naar Spoortje
+#TYPE=ethernet
+#STATUS=up
+#EXTRA_TYPE=eth2wifibridge
+#IP=172.16.17.137/29
+#DESC=Link naar Spoortje
+#SDESC=2Spoortje
+#DHCP=no
+#NSMAC=
+#VR20
 
 
Index: /nodes/CNodeSpoortje/wleiden.conf
===================================================================
--- /nodes/CNodeSpoortje/wleiden.conf	(revision 9081)
+++ /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
Index: /nodes/CNodeVosko2/wleiden.conf
===================================================================
--- /nodes/CNodeVosko2/wleiden.conf	(revision 9081)
+++ /nodes/CNodeVosko2/wleiden.conf	(revision 9093)
@@ -28,5 +28,5 @@
 STATUS=down
 EXTRA_TYPE=eth2wifibridge
-IP=172.16.0.178/30
+IP=172.16.17.153/29
 DESC=Link naar rund
 SDESC=2rund
@@ -35,7 +35,18 @@
 ESSID=il-no.vosko2.wleiden.net
 CHANNEL=44
+NSIP=172.16.17.154
 NSMAC=00:15:6D:F3:35:7D
 VR0
 
+$config{'vr0:0'}=sprintf <<VR00;
+COMMENT=naar Houtmarkt
+TYPE=ethernet
+STATUS=down
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.17.161/29
+DESC=Link naar houtmarkt
+SDESC=2houtmarkt
+DHCP=no
+VR00
 
 $config{'vr1'}=sprintf <<VR1;