Index: nodes/CNodeCeTIM2/wleiden.conf
===================================================================
--- nodes/CNodeCeTIM2/wleiden.conf	(revision 7605)
+++ nodes/CNodeCeTIM2/wleiden.conf	(revision 7606)
@@ -4,23 +4,16 @@
 $location="Hooglandse Kerk, Middelweg 2, 2312 KG, Leiden";
 $master_ip='172.17.143.2';  
-
 $gw_open='closed';
 $nodetype='CNode';
 $nodename='CeTIM2';
-$release="5.0-RELEASE";
+$release="8.0-RELEASE";
 $node_config_version="1";
 $genesis_control="YES";
-
 $OS='FreeBSD';
 $DISK='FLASH';
-
 $status='up';
-
 $labelpos='right';
-
-# edugis x,y 93894,463704
 $X='93894';
 $Y='463704';
-
 $AGGREGATE=24;
 
@@ -28,13 +21,9 @@
 TYPE=ethernet
 IP=172.17.143.2/28
-
 POINT_TO_POINT=172.17.143.1 172.17.143.3
-
 DESC=Ethernet naar kerkvloer
 SDESC=eth
 SPEED=10240000000
-
 DHCP=no
-
 sis1
 
@@ -42,14 +31,9 @@
 TYPE=ethernet
 IP=172.16.0.34/30
-
 POINT_TO_POINT=172.16.0.33
-
 DESC=Link naar cetim1
 SDESC=2cetim1
 SPEED=10240000000
-
 DHCP=no
-
-
 sis10
 
@@ -57,14 +41,9 @@
 TYPE=ethernet
 IP=172.31.255.2/28
-
 POINT_TO_POINT=172.16.255.1
-
 DESC=Link naar Proxy2
 SDESC=2proxy2
 SPEED=10240000000
-
 DHCP=no
-
-
 sis11
 
@@ -72,33 +51,22 @@
 TYPE=ethernet
 IP=172.16.0.57/30
-
 POINT_TO_POINT=172.16.0.58
-
 DESC=Link naar cetim3
 SDESC=2cetim3
 SPEED=10240000000
-
 DHCP=no
-
-
 sis12
-
 
 $config{'wi0'}=sprintf <<EW0;  #Interlinks NO
 TYPE=wireless
 IP=172.17.139.1/24
-
 DESC=CeTIM richting NO
 SDESC=no
 SPEED=11534336
 POINT_TO_POINT=
-
 DHCP=no
-
-
 MODE=master
 ESSID=il-no.cetim2.wleiden.net
 CHANNEL=10
-
 POLAR=Horiz
 ANTENNA=patch
@@ -108,5 +76,4 @@
 CABLE=1
 HEIGTH=45
-
 EW0
 
@@ -118,11 +85,7 @@
 SPEED=11534336
 POINT_TO_POINT=172.16.0.42
-
-
 DHCP=no
-
 EW00
 
-#########################alias interface########################
 $config{'wi0:1'}=sprintf <<EW01;
 TYPE=wireless
@@ -143,5 +106,4 @@
 EW02
 
-
 $config{'wi1'}=sprintf <<EW1;  #Interlinks ZW
 TYPE=wireless
@@ -151,11 +113,8 @@
 SPEED=11534336
 POINT_TO_POINT=172.16.5.1
-
 DHCP=no
-
 MODE=master
 ESSID=il-zw.cetim2.wleiden.net
 CHANNEL=11
-
 POLAR=Horiz
 ANTENNA=patch
@@ -165,7 +124,5 @@
 CABLE=1
 HEIGTH=45
-
 EW1
-
 
 $config{'wi1:0'}=sprintf <<EW10;  # link naar Lvl-z
@@ -176,6 +133,4 @@
 SPEED=11534336
 POINT_TO_POINT=172.16.0.78
-
-
 DHCP=no
 EW10
@@ -188,6 +143,4 @@
 SPEED=11534336
 POINT_TO_POINT=172.16.0.134
-
-
 DHCP=no
 WI11
@@ -200,18 +153,7 @@
 SPEED=11534336
 POINT_TO_POINT=172.16.1.38
-
-
 DHCP=no
 WI12
 
-$config{'wi1:3'}=sprintf <<WI13;
-TYPE=wireless
-IP=172.16.1.249/30
-DESC=Link naar stadhuis3
-SDESC=2stadhuis3
-SPEED=11534336
-POINT_TO_POINT=172.16.1.250
-DHCP=no
-WI13
 
 
Index: nodes/CNodeCeTIM3/wleiden.conf
===================================================================
--- nodes/CNodeCeTIM3/wleiden.conf	(revision 7605)
+++ nodes/CNodeCeTIM3/wleiden.conf	(revision 7606)
@@ -1,4 +1,2 @@
-#
-#
 #
 #  Read by /usr/local/sbin/wireless-up.pl
@@ -10,19 +8,13 @@
 $nodetype='CNode';
 $nodename='CeTIM3';
-$release="5.0-RELEASE";
+$release="8.0-RELEASE";
 $node_config_version="1";
 $genesis_control="YES";
-
 $OS='FreeBSD';
 $DISK='FLASH';
-
 $status='up';
-
 $labelpos='left';
-
-# edugis x,y 93894,463704
 $X='93894';
 $Y='463704';
-
 $AGGREGATE=24;
 
@@ -30,13 +22,9 @@
 TYPE=ethernet
 IP=172.17.143.3/28
-
 POINT_TO_POINT=172.17.143.1 172.17.143.2
-
 DESC=Ethernet naar kerkvloer
 SDESC=2cetim
 SPEED=10240000000
-
 DHCP=no
-
 sis1
 
@@ -44,15 +32,9 @@
 TYPE=ethernet
 IP=172.16.0.54/30
-
 POINT_TO_POINT=172.16.0.53
-
 DESC=Link naar cetim1
 SDESC=2cetim1
 SPEED=10240000000
-
 DHCP=no
-
-
-
 sis10
 
@@ -60,52 +42,32 @@
 TYPE=ethernet
 IP=172.31.255.3/28
-
 POINT_TO_POINT=172.16.255.1
-
 DESC=Link naar Proxy2
 SDESC=2proxy2
 SPEED=10240000000
-
 DHCP=no
-
-
-
 sis11
-
 
 $config{'sis1:2'}=sprintf <<sis12;  # Ethernet
 TYPE=ethernet
 IP=172.16.0.58/30
-
 POINT_TO_POINT=172.16.0.57
-
 DESC=Link naar cetim2
 SDESC=2cetim2
 SPEED=10240000000
-
 DHCP=no
-
-
-
 sis12
-
-
-
 
 $config{'wi0'}=sprintf <<EW;  #Interlinks NW
 TYPE=wireless
 IP=172.16.0.73/30
-
 DESC=Link to LvLn
 SDESC=2lvln
 SPEED=11534336
 POINT_TO_POINT=172.16.0.74
-
 DHCP=no
-
 MODE=master
 ESSID=il-nw.cetim3.wleiden.net
 CHANNEL=1
-
 POLAR=Horiz
 ANTENNA=patch
@@ -115,5 +77,4 @@
 CABLE=1
 HEIGTH=45
-
 EW
 
@@ -125,5 +86,4 @@
 #SPEED=11534336
 #POINT_TO_POINT=172.16.0.98
-#
 #DHCP=no
 #EW03
@@ -148,6 +108,4 @@
 SPEED=11534336
 POINT_TO_POINT=172.16.0.162
-
-
 DHCP=no
 EW00
@@ -160,5 +118,4 @@
 SPEED=11534336
 POINT_TO_POINT=172.16.0.182
-
 DHCP=no
 EW01
@@ -171,25 +128,18 @@
 SPEED=11534336
 POINT_TO_POINT=172.16.0.106
-
-
 DHCP=no
 EW02
 
-$config{'wi1'}=sprintf <<EW1;  #Interlinks ZO
+$config{'wi1'}=sprintf <<EW1;  # interlink roomburgh1
 TYPE=wireless
-IP=172.16.0.113/30
-
-DESC=Interlink naar Marten
-SDESC=2marten
+IP=172.16.0.193/30
+DESC=interlink 2roomburgh1
+SDESC=2roomburgh1
 SPEED=11534336
-POINT_TO_POINT=172.16.0.114
-
+POINT_TO_POINT=172.16.0.194
 DHCP=no
-
-
 MODE=master
 ESSID=il-zo.cetim3.wleiden.net
 CHANNEL=5
-
 POLAR=Horiz
 ANTENNA=patch
@@ -197,34 +147,3 @@
 DIRECTION=125
 BEAMWIDTH=40
-CABLE=1
-HEIGTH=45
-
 EW1
-
-$config{'wi1:0'}=sprintf <<EW10; # interlink plantsoen
-TYPE=wireless
-IP=172.16.1.217/30
-DESC=interlink 2plantsoen
-SDESC=2plantsoen
-SPEED=11534336
-POINT_TO_POINT=172.16.1.218
-DHCP=no
-
-EW10
-
-
-
-$config{'wi1:1'}=sprintf <<EW11; # interlink plantsoen
-TYPE=wireless
-IP=172.16.0.193/30
-DESC=interlink 2plantsoen
-SDESC=2plantsoen
-SPEED=11534336
-POINT_TO_POINT=172.16.0.194
-DHCP=no
-EW11
-
-
-
-
-
Index: nodes/CNodeHuub/wleiden.conf
===================================================================
--- nodes/CNodeHuub/wleiden.conf	(revision 7605)
+++ nodes/CNodeHuub/wleiden.conf	(revision 7606)
@@ -10,5 +10,5 @@
 $nodetype='CNode';
 $nodename='Huub';
-$release="7.2-RELEASE";
+$release="8.0-RELEASE";
 $node_config_version="1";
 $genesis_control="YES";
@@ -16,5 +16,4 @@
 $labelpos='left';
 $status='up';
-#edugis x,y 93348,463569
 $X='093348';
 $Y='463569';
@@ -147,5 +146,5 @@
 #IP=172.16.4.2
 #POLAR=Hor
-#ANTENNA=Engenius
+#ANTENNA=Nanostation2
 SIS40