Index: nodes/CNodeUniGor/wleiden.conf
===================================================================
--- nodes/CNodeUniGor/wleiden.conf	(revision 7482)
+++ nodes/CNodeUniGor/wleiden.conf	(revision 7485)
@@ -13,5 +13,5 @@
 $labelpos='right';
 
-$release="6.0-RELEASE";
+$release="8.0-RELEASE";
 $node_config_version="1";
 $genesis_control="YES";
@@ -25,28 +25,150 @@
 $Y='464813';
 
-$config{'sis0'}=sprintf <<SIS0;  # Ethernet
-TYPE=ethernet
-IP=172.19.128.65/28
-DESC=Ethernet naar UnigorN
-SDESC=eth
-SPEED=10240000000
-POINT_TO_POINT=
-DHCP=67-78
-
-SIS0
-
-$config{'sis0:0'}=sprintf <<SIS00;  # EthernetLink UniGorN
-TYPE=ethernet
-IP=172.16.1.169/30
-DESC=EthernetLink naar UniGorN
-SDESC=2unigorn
-SPEED=10240000000
-POINT_TO_POINT=172.16.1.170
-DHCP=no
-
-
-SIS00
-
-$config{'sis1'}=sprintf <<SIS1;  # a-link Nanostation5 naar DirkLos2
+$config{'ath0'}=sprintf <<ATH0;  # B link naar Cope
+TYPE=wireless
+IP=172.16.0.94/30
+DESC=Link naar Cope
+SDESC=2cope
+SPEED=11534336
+POINT_TO_POINT=172.16.0.93
+MODE=managed
+ESSID=omni.cope0.wleiden.net
+POLAR=Vert
+ANTENNA=Patch
+GAIN=15dBi
+DIRECTION=125
+BEAMWIDTH=30
+CABLE=2
+HEIGTH=35
+DHCP=no
+ATH0
+
+$config{'vr0'}=sprintf <<VR0;  # B link naar Robijn via Bullet 1
+TYPE=ethernet
+IP=172.16.1.29/30
+DESC=Link naar Robijn
+SDESC=2robijn
+SPEED=10240000000
+POINT_TO_POINT=172.16.1.30
+DHCP=no
+#MODE=master
+#ESSID=il-z.unigor.wleiden.net
+#CHANNEL=11
+#POLAR=Vert
+#ANTENNA=Patch
+#GAIN=15dBi
+#DIRECTION=160
+#BEAMWIDTH=40
+#CABLE=1
+#HEIGTH=35
+VR0
+
+$config{'vr0:0'}=sprintf <<VR00;  # B Link naar Zwaluwak via Bullet 1
+TYPE=ethernet
+IP=172.16.1.253/30
+DESC=Link naar Zwaluwak
+SDESC=2zwaluwak
+SPEED=10240000000
+POINT_TO_POINT=172.16.1.254
+VR00
+
+$config{'vr1'}=sprintf <<VR1;  # A link naar Cope via nanostation 1
+TYPE=ethernet
+IP=172.16.4.33/30
+DESC=A Link naar Cope
+SDESC=2copeA
+SPEED=10240000000
+POINT_TO_POINT=172.16.4.34
+DHCP=no
+#ESSID=il-Z0.unigor.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 Robijn via nanostation 2
+TYPE=ethernet
+IP=172.16.4.37/30		
+DESC=Link naar Robijn
+SDESC=2robijnA
+SPEED=10240000000
+POINT_TO_POINT=172.16.4.38
+DHCP=no
+#MODE=master
+#ESSID=ilA-z.unigor.wleiden.net
+#CHANNEL=11
+#POLAR=Vert
+#ANTENNA=Patch
+#GAIN=15dBi
+#DIRECTION=160
+#BEAMWIDTH=40
+#CABLE=1
+#HEIGTH=35
+VR2
+
+$config{'vr2:0'}=sprintf <<VR20;  # A Link naar Zwaluwak via nanostation 2
+TYPE=ethernet
+IP=172.16.4.21/30
+DESC=Link naar Zwaluwak
+SDESC=2zwaluwak
+SPEED=10240000000
+POINT_TO_POINT=172.16.4.22
+VR20
+
+$config{'vr3'}=sprintf <<VR3;  # AP richting NO via bullet 2
+TYPE=ethernet
+IP=$master_ip/26
+DESC=AP Richting NO
+SDESC=no
+SPEED=10240000000
+DHCP=10-60
+#MODE=master
+#ESSID=n-o.unigor.wleiden.net
+#CHANNEL=1
+#POLAR=Ver
+#ANTENNA=panel
+#GAIN=14dBi
+#DIRECTION=45
+#BEAMWIDTH=40
+#HEIGTH=35
+#CABLE=0
+VR3
+
+$config{'vr3:0'}=sprintf <<VR30;   # Link naar AZC via bullet 2
+TYPE=ethernet
+IP=172.16.0.165/30
+DESC=Link naar AZC
+SDESC=2azc
+DHCP=no
+POINT_TO_POINT=172.16.0.166
+SPEED=10240000000
+VR30
+
+$config{'vr3:1'}=sprintf <<VR31;  # Link naar Brug via bullet 2
+TYPE=ethernet
+IP=172.16.0.17/30
+DESC=Link naar Brug
+SDESC=2brug
+DHCP=no
+POINT_TO_POINT=172.16.0.18
+SPEED=10240000000
+VR31
+
+$config{'vr3:2'}=sprintf <<VR32;  # Link naar Camimplants via bullet 2
+TYPE=ethernet
+IP=172.16.1.117/30
+DESC=Link naar Camimplants
+SDESC=2camimplants
+DHCP=no
+POINT_TO_POINT=172.16.1.118
+SPEED=10240000000
+VR32
+
+$config{'vr4'}=sprintf <<VR4;  # a-link Nanostation5 naar DirkLos2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -57,15 +179,14 @@
 POINT_TO_POINT=172.16.3.74/30
 DHCP=no
-
-SIS1
-
-$config{'sis1:0'}=sprintf <<SIS10;  # management Nanostation5
-TYPE=ethernet
-IP=172.16.3.113/30
-DESC=EthernetLink naar Nanostation 5
-SDESC=2nanostation5
-SPEED=10240000000
-POINT_TO_POINT=172.16.3.114
-DHCP=no
+VR4
+
+#$config{'vr4:0'}=sprintf <<VR40;  # management Nanostation5
+#TYPE=ethernet
+#IP=172.16.3.113/30
+#DESC=EthernetLink naar Nanostation 5
+#SDESC=2nanostation5
+#SPEED=10240000000
+#IP nanostation 172.16.3.114
+#DHCP=no
 #ESSID=il-0.unigor.wleiden.net
 #CHANNEL=
@@ -77,120 +198,26 @@
 #CABLE=0
 #HEIGHT=35
-
-SIS10
-
-$config{'wi0'}=sprintf <<EW0;  # AP richting NO
-TYPE=wireless
-IP=$master_ip/26
-DESC=AP Richting NO
-SDESC=no
-SPEED=11534336
-DHCP=10-60
-
-MODE=master
-ESSID=n-o.unigor.wleiden.net
-CHANNEL=1
-
-POLAR=Ver
-ANTENNA=panel
-GAIN=14dBi
-DIRECTION=45
-BEAMWIDTH=40
-HEIGTH=35
-CABLE=0
-
-EW0
-
-$config{'wi0:0'}=sprintf <<EW00;   # Link naar AZC
-TYPE=wireless
-IP=172.16.0.165/30
-
-DESC=Link naar AZC
-SDESC=2azc
-DHCP=no
-POINT_TO_POINT=172.16.0.166
-SPEED=11534336
-
-EW00
-
-$config{'wi0:1'}=sprintf <<EW01;  # Link naar Brug
-TYPE=wireless
-IP=172.16.0.17/30
-
-DESC=Link naar Brug
-SDESC=2brug
-DHCP=no
-POINT_TO_POINT=172.16.0.18
-SPEED=11534336
-
-
-EW01
-
-$config{'wi0:2'}=sprintf <<EW02;  # Link naar Camimplants
-TYPE=wireless
-IP=172.16.1.117/30
-
-DESC=Link naar Camimplants
-SDESC=2camimplants
-DHCP=no
-POINT_TO_POINT=172.16.1.118
-SPEED=11534336
-
-EW02
-
-$config{'wi1'}=sprintf <<EW1;  # link naar Robijn
-TYPE=wireless
-IP=172.16.1.29/30
-DESC=Link naar Robijn
-SDESC=2robijn
-SPEED=11534336
-POINT_TO_POINT=172.16.1.30
-
-MODE=master
-ESSID=il-z.unigor.wleiden.net
-CHANNEL=11
-
-POLAR=Vert
-ANTENNA=Patch
-GAIN=15dBi
-DIRECTION=160
-BEAMWIDTH=40
-CABLE=1
-HEIGTH=35
-DHCP=no
-
-EW1
-
-$config{'wi1:0'}=sprintf <<EW10;  # Link naar Zwaluwak
-TYPE=wireless
-IP=172.16.1.253/30
-DESC=Link naar Zwaluwak
-SDESC=2zwaluwak
-SPEED=11534336
-POINT_TO_POINT=172.16.1.254
-EW10
-
-$config{'wi2'}=sprintf <<EW2;  # link naar Cope
-TYPE=wireless
-IP=172.16.0.94/30
-DESC=Link naar Cope
-SDESC=2cope
-SPEED=11534336
-POINT_TO_POINT=172.16.0.93
-
-MODE=managed
-ESSID=omni.cope0.wleiden.net
-#CHANNEL=5
-POLAR=Vert
-ANTENNA=Patch
-GAIN=15dBi
-DIRECTION=125
-BEAMWIDTH=30
-CABLE=2
-HEIGTH=35
-DHCP=no
-
-EW2
-
-
-
+#VR40
+
+$config{'vr5'}=sprintf <<VR5;  # Ethernet
+TYPE=ethernet
+IP=172.19.128.65/30
+DESC=Ethernet naar UnigorN
+SDESC=eth
+SPEED=10240000000
+POINT_TO_POINT=172.19.128.66
+DHCP=no
+VR5
+
+$config{'vr5:0'}=sprintf <<VR50;  # EthernetLink UniGorN
+TYPE=ethernet
+IP=172.16.1.169/30
+DESC=EthernetLink naar UniGorN
+SDESC=2unigorn
+SPEED=10240000000
+POINT_TO_POINT=172.16.1.170
+DHCP=no
+VR50
+
+
+