Index: nodes/CNodeRV/wleiden.conf
===================================================================
--- nodes/CNodeRV/wleiden.conf	(revision 7925)
+++ nodes/CNodeRV/wleiden.conf	(revision 7980)
@@ -1,5 +1,2 @@
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeRV
@@ -8,112 +5,72 @@
 $nodetype='CNode';
 $nodename='RV';
-
-$release="6.0-STABLE";
-
-
+$release="8.0-RELEASE";
 $status='up';
-
-# edugis x,y 92445,462819
 $X='92445';
 $Y='462819';
 
-$LOKATIE='';
+$config{'ath0'}=sprintf <<ATH0;  # ap 
+TYPE=wireless
+IP=$master_ip/26
+DESC=AP voor de buurt
+SDESC=ap
+DHCP=10-60
+MODE=master
+ESSID=ap-WirelessLeiden-RijnVliet
+CHANNEL=7
+ATH0
 
-$config{'ep0'}=sprintf <<ED0;  # Ethernet
+$config{'vr0'}=sprintf <<VR0;  # Ethernet naar proxy
+TYPE=ethernet
+IP=172.20.128.97/29
+DESC=Ethernet naar proxy
+SDESC=2proxy
+DHCP=no
+VR0
+
+$config{'vr1'}=sprintf <<VR1;  # link naar IMI
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.3.94/30
+DHCP=no
+DESC=Link naar IMI
+SDESC=2imi
+#MODE=bridge ap
+#ESSID=il-no.rv.wleiden.net
+#CHANNEL=60
+#NSMAC=
+VR1
+
+$config{'vr2'}=sprintf <<VR2;  # a-link naar AJSoft
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=/30
+DHCP=no
+DESC=a-Link naar AJSoft
+SDESC=a2ajsoft
+#MODE=managed
+#ESSID=il-o.ajsoft2.wleiden.net
+#CHANNEL=
+VR2
+
+$config{'ue0'}=sprintf <<UE0;  # Ethernet
 TYPE=ethernet
 IP=172.20.128.65/27
-
 DESC=Accesspoint in internetcafe
 SDESC=internetcafe
+DHCP=70-80
+UE0
 
-DHCP=70-80
-
-#IRQ=9 ?!
-#PORT=0X280-0X28F
-
-ED0
-
-
-$config{'ep1'}=sprintf <<ED1;  # Ethernet
+$config{'ue1'}=sprintf <<UE1;  # b-link naar ajsoft 
 TYPE=ethernet
-IP=172.20.128.97/29
-
-DESC=Ethernet naar proxy
-SDESC=2proxy
-
-DHCP=no
-
-#IRQ=10
-#PORT=0x300-0x30f
-
-ED1
-
-$config{'ep1:0'}=sprintf <<ED10;  # Ethernet
-TYPE=ethernet
-IP=172.31.255.2/28
-
-DESC=Ethernet naar proxy3
-SDESC=link2proxy3
-
-DHCP=no
-
-ED10
-
-
-$config{'wi0'}=sprintf <<EW0;  #  Omni
-TYPE=wireless
-IP=$master_ip/26
-DESC=omni
-SDESC=omni
-
-MODE=master
-ESSID=ap-omni.renv0.wleiden.net
-
-CHANNEL=7
-
-
-DHCP=10-60
-EW0
-
-
-$config{'wi1'}=sprintf <<EW1;  # link naar CeTIM2
-TYPE=wireless
-IP=172.16.0.134/30
-DESC=Link naar Cetim2
-SDESC=2cetim2
-MODE=managed
-ESSID=il-zw.cetim2.wleiden.net
-CHANNEL=11
-DHCP=no
-EW1
-
-$config{'wi2'}=sprintf <<EW2;  # link naar Robijn
-TYPE=wireless
-IP=172.16.0.137/30
-DESC=Link naar Robijn
-SDESC=2robijn
-MODE=master
-ESSID=il-nw.rv.wleiden.net
-CHANNEL=9
-
-DHCP=no
-
-EW2
-
-$config{'wi3'}=sprintf <<EW3;  # link naar ajsoft 
-TYPE=wireless
+EXTRA_TYPE=eth2wifibridge
 IP=172.16.0.141/30
 DESC=Link naar ajsoft
-SDESC=2ajsoft
-
+SDESC=b2ajsoft
 MODE=master
 ESSID=il-zw.rv.wleiden.net
-
 CHANNEL=4
-
-
 DHCP=no
-
-EW3
+UE1