Index: /nodes/CNodeVosko2/wleiden.conf
===================================================================
--- /nodes/CNodeVosko2/wleiden.conf	(revision 8065)
+++ /nodes/CNodeVosko2/wleiden.conf	(revision 8066)
@@ -1,88 +1,48 @@
-
-#
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeVosko2
 
 $location="Pieterskerk, Kloksteeg 16, 2311 SL, Leiden";
-
 $master_ip='172.17.175.1';
 $nodetype='CNode';
 $nodename='Vosko2';
 $release="8.0-RELEASE";
-$DISK='FLASH';
-#tproxy (tijdelijk) niet geconfigureerd
-#$tproxy='172.17.175.64/28';
 $status='up';
-#edugis x,y 93459,463657
 $X='93459';
 $Y='463657';
 
-$config{'sis0'}=sprintf <<SIS0;  # Ethernet
+$config{'ue0'}=sprintf <<UE0; # 
+
+$config{'ath0'}=sprintf <<ATH0;  # ap noord
+TYPE=wireless
+IP=$master_ip/26
+DESC=AP west
+SDESC=ap-n
+DHCP=10-60
+MODE=master
+ESSID=ap-WirelessLeiden-Vosko2
+CHANNEL=2
+ATH0
+
+$config{'vr0'}=sprintf <<VR0;  # 
 TYPE=ethernet
-IP=172.17.175.65/28
-DESC=Ethernet naar Pieterskerk
-SDESC=eth
-# 65 - default router
-# 66 - AP itself
-#
-DHCP=67-78
-SIS0
-
-$config{'sis1'}=sprintf <<SIS1; # Ethernet
-TYPE=ethernet
-IP=172.17.145.2/28
-DESC=Ethernet naar Vosko1
-SDESC=2vosko1
-DHCP=no
-SIS1
-
-$config{'wi0'}=sprintf <<WI0;
-TYPE=wireless
-IP=172.16.0.205/30
-DESC=Link naar Thomas
-SDESC=2thomas
-DHCP=no
-MODE=master
-ESSID=il-zo.vosko2.wleiden.net
-CHANNEL=3
-WI0
-
-$config{'wi0:0'}=sprintf <<WI00;
-TYPE=wireless
-IP=172.16.3.69/30
-DESC=Link naar Langebrug
-SDESC=2langebrug
-DHCP=no
-WI00
-
-$config{'wi1'}=sprintf <<WI1;
-TYPE=wireless
-IP=172.16.3.5/30
-DESC=Link naar Oblste
-SDESC=2oblste
-DHCP=no
-MODE=master
-ESSID=il-w.vosko2.wleiden.net
-CHANNEL=9
-WI1
-
-$config{'wi2'}=sprintf <<WI2; # link naar rabo
-TYPE=wireless
-IP=172.16.0.97/30
-DESC=Link naar rabo
-SDESC=2rabo
-DHCP=no
-MODE=master
-ESSID=il-no.vosko2.wleiden.net
-CHANNEL=13
-WI2
-
-$config{'wi2:0'}=sprintf <<WI20;
-TYPE=wireless
+EXTRA_TYPE=eth2wifibridge
 IP=172.16.0.178/30
 DESC=Link naar rund
 SDESC=2rund
 DHCP=no
-WI20
+#MODE=master
+#ESSID=il-no.vosko2.wleiden.net
+#CHANNEL=
+#NSMAC=
+VR0
 
+
+$config{'vr2'}=sprintf <<VR2; # lokaal ethernet via usb-lan adapter
+TYPE=ethernet
+IP=172.17.175.72/28
+DESC=lokaal ethernet
+SDESC=ethernet
+DHCP=no
+UE0
+
+
Index: des/CNodeVosko2/wleiden.conf.new
===================================================================
--- /nodes/CNodeVosko2/wleiden.conf.new	(revision 8065)
+++ 	(revision )
@@ -1,48 +1,0 @@
-#
-# config CNodeVosko2
-
-$location="Pieterskerk, Kloksteeg 16, 2311 SL, Leiden";
-$master_ip='172.17.175.1';
-$nodetype='CNode';
-$nodename='Vosko2';
-$release="8.0-RELEASE";
-$status='up';
-$X='93459';
-$Y='463657';
-
-$config{'ue0'}=sprintf <<UE0; # 
-
-$config{'ath0'}=sprintf <<ATH0;  # ap noord
-TYPE=wireless
-IP=$master_ip/26
-DESC=AP west
-SDESC=ap-n
-DHCP=10-60
-MODE=master
-ESSID=ap-WirelessLeiden-Vosko2
-CHANNEL=2
-ATH0
-
-$config{'vr0'}=sprintf <<VR0;  # 
-TYPE=ethernet
-EXTRA_TYPE=eth2wifibridge
-IP=172.16.0.178/30
-DESC=Link naar rund
-SDESC=2rund
-DHCP=no
-#MODE=master
-#ESSID=il-no.vosko2.wleiden.net
-#CHANNEL=
-#NSMAC=
-VR0
-
-
-$config{'vr2'}=sprintf <<VR2; # lokaal ethernet via usb-lan adapter
-TYPE=ethernet
-IP=172.17.175.72/28
-DESC=lokaal ethernet
-SDESC=ethernet
-DHCP=no
-UE0
-
-