Index: nodes/CNodeJVC/wleiden.conf
===================================================================
--- nodes/CNodeJVC/wleiden.conf	(revision 7942)
+++ nodes/CNodeJVC/wleiden.conf	(revision 7943)
@@ -1,5 +1,2 @@
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeJVC
@@ -8,95 +5,57 @@
 $nodetype='CNode';
 $nodename='JVC';
-
-$release="5.0-RELEASE";
-
-
+$release="8.0-RELEASE";
 $status='up';
-
-# edugis x,y 94888,461946
 $X='94888';
 $Y='461946';
 
-
-$config{'ep0'}=sprintf <<ED0;  # Ethernet
-TYPE=ethernet
-IP=172.18.32.65/28
-
-DESC=Ethernet naar JVC
-SDESC=eth
-
-DHCP=no
-
-
-ED0
-
-
-
-$config{'wi0'}=sprintf <<EW0;  # omni
+$config{'ath0'}=sprintf <<ATH0;  # omni
 TYPE=wireless
 IP=$master_ip/26
+DESC=AP voor de buurt
+SDESC=ap
+DHCP=10-60
+MODE=master
+ESSID=ap-WirelessLeiden-JVC
+CHANNEL=4
+ATH0
 
-DESC=omni
-SDESC=omni
+$config{'vr0'}=sprintf <<VR0; # a-link to Graficall via Nanostation5
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.0.241/30
+DESC=Ethernet naar interlink zw van Graficall
+SDESC=2graficall
+DHCP=no
+#MODE=11a bridge managed
+#ESSID=il-zw.graficall.wleiden.net
+#CHANNEL=36
+#NSMAC=
+VR0
 
-DHCP=10-60
+$config{'vr1'}=sprintf <<VR1; # link naar ROCl
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.0.234/30
+DESC=Link ROC
+SDESC=2ROC
+DHCP=no
+#MODE=11a bridge ap
+#ESSID=il-w.jvc.wleiden.net
+#CHANNEL=108
+#NSMAC=
+VR1
 
+$config{'vr2'}=sprintf <<VR2; # link naar Zwet 
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.1.161/30
+DESC=Link Zwet
+SDESC=2Zwet
+DHCP=no
+#MODE=11a bridge ap
+#ESSID=il-z.jvc.wleiden.net
+#CHANNEL=60
+#NSMAC=
+VR2
 
-MODE=master
-ESSID=ap-omni.jvc.wleiden.net
-CHANNEL=1
-
-
-EW0
-
-
-
-$config{'wi1'}=sprintf <<EW1;  # link naar ROCl
-TYPE=wireless
-IP=172.16.0.234/30
-DESC=Link naar ROCL 
-SDESC=2rocl
-
-
-MODE=managed
-ESSID=il-no.rocl.wleiden.net
-
-CHANNEL=5
-
-
-DHCP=no
-
-EW1
-
-
-$config{'wi2'}=sprintf <<EW2;
-TYPE=wireless
-IP=172.16.1.6/30
-DESC=Link naar Roomburgh
-SDESC=2roomburgh2
-
-MODE=managed
-ESSID=ap-no.roomburgh2.wleiden.net
-
-
-DHCP=no
-
-EW2
-
-
-$config{'wi3'}=sprintf <<EW3; # Link naar Duivenhok
-TYPE=wireless
-IP=172.16.1.161/30
-DESC=Link naar Duivenhok
-SDESC=2duivenhok
-
-
-MODE=master
-ESSID=il-o.jvc.wleiden.net
-
-CHANNEL=11
-
-
-DHCP=no
-
-EW3