Index: nodes/CNodeRustenborch/wleiden.conf
===================================================================
--- nodes/CNodeRustenborch/wleiden.conf	(revision 8108)
+++ nodes/CNodeRustenborch/wleiden.conf	(revision 8113)
@@ -1,105 +1,70 @@
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeRustenborch
 $location="Zorgcentrum Rustenborch, Van Wijckersloothplein 3, 2341 BB, Oegstgeest";
 $master_ip='172.23.24.1';
-$AGGREGATE='21';
-
 $nodetype='CNode';
 $nodename='Rustenborch';
-
-$release="5.0-RELEASE";
-
-
+$release="8.0-RELEASE";
 $status='up';
-
-# edugis x,y 91855,466407
 $X='91855';
 $Y='466407';
 
-$config{'wi0'}=sprintf <<EW0;  #  Omni
+$config{'ath0'}=sprintf <<ATH0;  #  Ap
 TYPE=wireless
 IP=$master_ip/26
-DESC=omni
-SDESC=omni
+DESC=ap
+SDESC=ap
+MODE=master
+ESSID=ap-WirelessLeiden-Rustenborch
+CHANNEL=1
+DHCP=10-60
+ATH0
 
-
-MODE=master
-ESSID=ap.rustenborch.wleiden.net
-
-CHANNEL=1
-
-
-DHCP=10-60
-
-EW0
-
-$config{'ep0'}=sprintf <<ED0;  # Ethernet
+$config{'vr0'}=sprintf <<VR0;  # Ethernet
 TYPE=ethernet
 IP=172.23.24.65/28
-
-
 DESC=Ethernet naar rustenborch
 SDESC=eth
+DHCP=66-78
+VR0
 
-DHCP=66-78
-
-
-
-
-
-ED0
-
-
-$config{'wi1'}=sprintf <<EW1;
-TYPE=wireless
+$config{'vr1'}=sprintf <<VR1; # Link Lijtweg2
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
 IP=172.16.1.86/30
+DHCP=no
 DESC=Link naar Lijtweg2
 SDESC=2lijtweg2
+#MODE=bridge station
+#ESSID=il-w.lijtweg2.wleiden.net
+#CHANNEL=116
+#NS_IP=192.168.1.21
+#NSMAC=00:15:6D:
+VR1
 
-
-MODE=managed
-ESSID=il-zw.lijtweg2.wleiden.net
-
-#CHANNEL=10
-
-
+$config{'VR2'}=sprintf <<VR2;  # Link naar UniGorN 
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.1.90/30
 DHCP=no
-
-EW1
-
-$config{'wi2'}=sprintf <<EW2;  # link naar Unused
-TYPE=wireless
+DESC=Link naar unigorn
+SDESC=2unigorn
+#MODE=bridge station
+#ESSID=il-o.unigorn.wleiden.net
+#CHANNEL=104
+#NSMAC=00:15:6D:
+#NSIP=192.168.1.21
+VR2
+ 
+$config{'ue0'}=sprintf <<UE0;  # link naar Unused
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
 IP=172.16.1.101/30
+DHCP=no
 DESC=Link naar Unused
 SDESC=2unused
+#MODE=master
+#ESSID=il-no.rustenborch.wleiden.net
+#CHANNEL=36
+UE0
 
-
-MODE=master
-ESSID=il-no.rustenborch.wleiden.net
-CHANNEL=7
-
-
-DHCP=no
-
-EW2
-
-
-$config{'wi3'}=sprintf <<EW3;  # Link naar UniGorN 
-TYPE=wireless
-IP=172.16.1.90/30
-
-DESC=Link naar unigorn
-SDESC=2unigorn
-
-
-MODE=managed
-ESSID=ap-n.unigorn.wleiden.net
-#CHANNEL=4
-
-
-
-EW3
-