Index: nodes/CNodeDirkLos1/wleiden.conf
===================================================================
--- nodes/CNodeDirkLos1/wleiden.conf	(revision 8174)
+++ nodes/CNodeDirkLos1/wleiden.conf	(revision 8175)
@@ -1,6 +1,2 @@
-#
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeDirkLos1
@@ -9,49 +5,8 @@
 $nodetype='CNode';
 $nodename='DirkLos1';
-$release="7.2-RELEASE";
+$release="8.0-RELEASE";
 $status='up';
-# edugis x,y 92299,464748
 $X='092299';
 $Y='464748';
-
-$config{'sis0'}=sprintf <<EE0;  # ethernet naar DirkLos2 via switch in voedingskast met PoE
-TYPE=ethernet
-IP=172.16.3.58/30
-DESC=Ethernet naar DirkLos2
-SDESC=eth2DLos2
-DHCP=no
-
-EE0
-
-$config{'sis0:0'}=sprintf <<EE00;  # alias voor lokaal ethernet (switch in voedingskast)
-TYPE=ethernet
-IP=172.16.176.66/27
-DESC=Local Ethernet
-SDESC=localeth
-DHCP=no
-
-EE00
-
-
-$config{'sis1'}=sprintf <<EE1; # a-link to Vosko3 via Nanostation5
-TYPE=ethernet
-EXTRA_TYPE=eth2wifibridge
-IP=172.16.3.174/30
-DESC=Ethernet to interlink south-east (Vosko3)
-SDESC=2Vosko3
-DHCP=no
-EE1
-
-$config{'sis1:0'}=sprintf <<EE10; # to nanostation mgmt interface
-TYPE=ethernet
-IP=172.16.3.197/30
-DESC=ethernet to nanostation mgmt interface
-SDESC=manageNS5
-DHCP=no
-#MODE=managed
-#ESSID=il-wnw.vosko3.wleiden.net
-#CHANNEL=100 (follows)
-EE10
-
 
 $config{'ath0'}=sprintf <<ATH0;
@@ -66,24 +21,60 @@
 ATH0
 
-$config{'wi0'}=sprintf <<EW0;  # link naar Camimplants
-TYPE=wireless
-IP=172.16.1.149/30
-DESC=Link naar Camimplants
-SDESC=2camimplants
-MODE=master
-ESSID=il-w.dirklos1.wleiden.net
-CHANNEL=4
+$config{'vr0'}=sprintf <<VR0; # a-link naar LUMC
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.4.81/29
+DESC=Ethernet to interlink oost (LIMC)
+SDESC=2cam
 DHCP=no
-EW0
+#MODE=ap
+#ESSID=il-o.dirklos1.wleiden.net
+#CHANNEL=
+#NSMAC=
+#NSIP=172.16.4.82/29
+VR0
 
-$config{'wi1'}=sprintf <<EW1; # Link naar Vosko1
-TYPE=wireless
-IP=172.16.3.26/30
-DESC=Link naar Vosko1
-SDESC=2vosko1
-MODE=managed
-ESSID=il-nw.vosko1.wleiden.net
-#CHANNEL=8
+$config{'vr1'}=sprintf <<VR1; # a-link to Vosko3
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.4.76/29
+DESC=Ethernet to interlink south-east (Vosko3)
+SDESC=2Vosko3
 DHCP=no
-EW1
+#MODE=station
+#ESSID=il-wnw.vosko3.wleiden.net
+#CHANNEL=100
+#NSMAC=
+#NSIP=172.16.4.75/29
+VR1
 
+$config{'vr2'}=sprintf <<VR2; # a-link naar Cam
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.4.89/29
+DESC=Ethernet to interlink west (Cam)
+SDESC=2cam
+DHCP=no
+#MODE=ap
+#ESSID=il-zw.dirklos1.wleiden.net
+#CHANNEL=
+#NSMAC=
+#NSIP=172.16.4.90/29
+VR2
+
+$config{'ue0'}=sprintf <<UE0;  # lokaal ethernet naar DirkLos2 via switch in voedingskast met PoE
+TYPE=ethernet
+IP=172.16.3.58/30
+DESC=Ethernet naar DirkLos2
+SDESC=eth2DLos2
+DHCP=no
+UE0
+
+$config{'ue0:0'}=sprintf <<UE00;  # alias voor lokaal ethernet (switch in voedingskast)
+TYPE=ethernet
+IP=172.16.176.66/27
+DESC=Local Ethernet
+SDESC=localeth
+DHCP=no
+UE00
+