Index: /nodes/CNodeUniGorN/wleiden.conf
===================================================================
--- /nodes/CNodeUniGorN/wleiden.conf	(revision 7485)
+++ /nodes/CNodeUniGorN/wleiden.conf	(revision 7486)
@@ -15,5 +15,5 @@
 $DISK='FLASH';
 
-$release="5.0-RELEASE";
+$release="8.0-RELEASE";
 $node_config_version="1";
 $genesis_control="YES";
@@ -27,59 +27,5 @@
 $Y='464861';
 
-$config{'sis0'}=sprintf <<SIS0;  # EthernetLink naar UniGor
-TYPE=ethernet
-IP=172.16.1.170/30
-DESC=EthernetLink naar UniGor
-SDESC=2unigor
-SPEED=10240000000
-POINT_TO_POINT=172.16.1.169
-
-DHCP=no
-
-SIS0
-
-$config{'sis0:0'}=sprintf <<SIS01; #link naar gorlaeus 
-TYPE=ethernet
-IP=172.19.128.69/28
-DESC=Local gorlaeus subnet
-SDESC=2gorlaeus
-SPEED=1024000000
-
-
-DHCP=no
-
-SIS01
-
-$config{'wi0'}=sprintf <<EW0; #link naar kaagdorp
-TYPE=wireless
-IP=172.16.1.45/30
-DESC=Link naar kaag2
-SDESC=2kaag2
-SPEED=11534336
-POINT_TO_POINT=172.16.1.46
-DHCP=no
-MODE=master
-ESSID=il-o.unigorn.wleiden.net
-CHANNEL=9
-POLAR=vert
-ANTENNA=SD19
-GAIN=19dBi
-DIRECTION=45
-BEAMWIDTH=30
-CABLE=0
-HEIGTH=50
-EW0
-
-$config{'wi0:0'}=sprintf <<EW00; #link naar kaag
-TYPE=wireless
-IP=172.16.0.217/30
-DESC=Link naar kaag
-SDESC=2kaag
-SPEED=11534336
-POINT_TO_POINT=172.16.0.218
-DHCP=no
-EW00
-
-$config{'wi1'}=sprintf <<EW1;  # oegstgeest richting N
+$config{'ath0'}=sprintf <<ATH0;  # oegstgeest richting N
 TYPE=wireless
 IP=$master_ip/26
@@ -99,7 +45,7 @@
 CABLE=0
 HEIGTH=50
-EW1
+ATH0
 
-$config{'wi1:0'}=sprintf <<EW10;  
+$config{'ath0:0'}=sprintf <<ATH00;  
 TYPE=wireless
 IP=172.16.1.89/30
@@ -109,7 +55,7 @@
 POINT_TO_POINT=172.16.1.90
 DHCP=no
-EW10
+ATH00
 
-$config{'wi1:1'}=sprintf <<EW11;
+$config{'ath0:1'}=sprintf <<ATH01;
 TYPE=wireless
 IP=172.16.1.93/30
@@ -119,7 +65,7 @@
 POINT_TO_POINT=172.16.1.94
 DHCP=no
-EW11
+ATH01
 
-$config{'wi1:2'}=sprintf <<EW12;
+$config{'ath0:2'}=sprintf <<ATH02;
 TYPE=wireless
 IP=172.16.3.249/30
@@ -127,4 +73,95 @@
 SDESC=2liacs
 DHCP=no
-EW12
+ATH02
 
+$config{'vr0'}=sprintf <<VR0; #link naar kaagdorp via Bullet 1
+TYPE=ethernet
+IP=172.16.1.45/30
+DESC=Link naar kaag2
+SDESC=2kaag2
+SPEED=1024000000
+POINT_TO_POINT=172.16.1.46
+DHCP=no
+#MODE=master
+#ESSID=il-o.unigorn.wleiden.net
+#CHANNEL=9
+#POLAR=vert
+#ANTENNA=SD19
+#GAIN=19dBi
+#DIRECTION=45
+#BEAMWIDTH=30
+#CABLE=0
+#HEIGTH=50
+VR0
+
+$config{'vr0:0'}=sprintf <<VR00; #link naar kaag
+TYPE=ethernet
+IP=172.16.0.217/30
+DESC=Link naar kaag
+SDESC=2kaag
+SPEED=1024000000
+POINT_TO_POINT=172.16.0.218
+DHCP=no
+VR00
+
+$config{'vr1'}=sprintf <<VR1;  # A link ? nanostation 1
+TYPE=ethernet
+IP=172.16.4.41/30
+DESC=A Link naar unused
+SDESC=2unused
+SPEED=10240000000
+POINT_TO_POINT=172.16.4.42
+DHCP=no
+#ESSID=ilA-o.unigorn.wleiden.net
+#CHANNEL=
+#mode 11a bridge master
+#POLAR=Hor
+#GAIN=
+#DIRECTION=90
+#BEAMWIDTH=
+#CABLE=0
+#HEIGHT=35
+VR1
+
+$config{'vr2'}=sprintf <<VR2;  # A link naar ? via nanostation 2
+TYPE=ethernet
+IP=172.16.4.45/30		
+DESC=Link naar unused
+SDESC=unused
+SPEED=10240000000
+POINT_TO_POINT=172.16.4.46
+DHCP=no
+#MODE=master
+#ESSID=ilA-n.unigor.wleiden.net
+#CHANNEL=11
+#POLAR=Vert
+#ANTENNA=Patch
+#GAIN=15dBi
+#DIRECTION=160
+#BEAMWIDTH=40
+#CABLE=1
+#HEIGTH=35
+VR2
+
+$config{'vr3'}=sprintf <<VR3;  # EthernetLink naar UniGor
+TYPE=ethernet
+IP=172.16.1.170/30
+DESC=EthernetLink naar UniGor
+SDESC=2unigor
+SPEED=10240000000
+POINT_TO_POINT=172.16.1.169
+DHCP=no
+VR3
+
+#$config{'vr3:0'}=sprintf <<VR30; #link naar gorlaeus 
+#TYPE=ethernet
+#IP=172.19.128.69/28
+#DESC=Local gorlaeus subnet
+#SDESC=2gorlaeus
+#SPEED=1024000000
+#DHCP=no
+#VR30
+
+
+
+