Index: nodes/CNodeAZC/wleiden.conf
===================================================================
--- nodes/CNodeAZC/wleiden.conf	(revision 5875)
+++ nodes/CNodeAZC/wleiden.conf	(revision 5899)
@@ -39,9 +39,9 @@
 ED0
 
-$config{'wi0'}=sprintf <<EW0;  #link naar Endegeest
+$config{'wi0'}=sprintf <<EW0;  #link naar Lijtweg2
 TYPE=wireless
-IP=172.19.144.129/28
+IP=172.16.1.97/30
 DESC=Link naar Endegeest
-SDESC=2endegeest
+SDESC=2lijtweg2
 SPEED=11534336
 
@@ -66,4 +66,15 @@
 
 EW0
+
+$config{'wi0:0'}=sprintf <<EW00;  #link naar Endegeest
+TYPE=wireless
+IP=172.19.144.129/28
+DESC=Link naar Endegeest
+SDESC=2endegeest
+SPEED=11534336
+POINT_TO_POINT=172.19.144.130
+
+EW00
+
 
 $config{'wi1'}=sprintf <<EW1;    #link naar WP
Index: nodes/CNodeAlan/wleiden.conf
===================================================================
--- nodes/CNodeAlan/wleiden.conf	(revision 5899)
+++ nodes/CNodeAlan/wleiden.conf	(revision 5899)
@@ -0,0 +1,158 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeAlan
+$location="Alan Janssen, Joke Smitlaan 116, Voorschoten";
+$master_ip='172.20.148172.16.3.54.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Alan';
+$release="6.0-STABLE";
+$node_config_version="1";
+$genesis_control="YES";
+
+$OS='FreeBSD';
+
+$status='up';
+
+# edugis x,y 92035,462384
+$X='92035';
+$Y='462384';
+
+$LOKATIE='Joke Smitlaan Voorschoten';
+
+
+
+$config{'ep0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.20.148.65/28
+
+DESC=Ethernet naar Alan 
+SDESC=eth
+SPEED=10240000000
+
+DHCP=67-78
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+
+
+$config{'wi0'}=sprintf <<EW0;  # omni
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=omni voor de buurt
+SDESC=omni
+SPEED=11534336
+
+DHCP=10-60
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=ap-omni.alan.wleiden.net
+CHANNEL=4
+
+POLAR=Ver
+ANTENNA=omni
+GAIN=6dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+HEIGTH=22
+
+EW0
+
+
+
+$config{'wi1'}=sprintf <<EW1;  # link AJSoft2
+TYPE=wireless
+IP=172.16.3.54/30
+DESC=Link naar AJSoft2
+SDESC=2ajsoft2
+SPEED=11534336
+POINT_TO_POINT=172.16.3.53
+DHCP=no
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=1172.16.3.53
+
+MODE=managed
+ESSID=il-w.ajsoft2.wleiden.net
+
+#CHANNEL=13
+
+POLAR=Hor
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=90
+BEAMWIDTH=40
+CABLE=1
+HEIGTH=22
+
+EW1
+
+
+$config{'wi2'}=sprintf <<EW2; # Link naar Voorschoten
+TYPE=wireless
+IP= 172.16.3.69/30
+DESC=InterLink naar Voorschoten
+SDESC=2voorschoten
+SPEED=1153436
+POINT_TO_POINT=172.16.3.70
+DHCP=no
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.3.70
+
+MODE=master
+ESSID=il-zw.alan.wleiden.net
+
+CHANNEL=1
+
+POLAR=Hor
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=315
+BEAMWIDTH=40
+CABLE=2
+HEIGTH=22
+
+EW2
+
+
+$config{'wi3'}=sprintf <<EW3; # Link naar Stevenshof
+TYPE=wireless
+IP=172.16.3.73/30
+DESC=Link naar Stevenshof
+SDESC=2stevenshof
+SPEED=1153436
+POINT_TO_POINT=172.16.3.73
+DHCP=no
+
+OSPF_AREA=0
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.3.73
+
+MODE=master
+ESSID=il-n.alan.wleiden.net
+CHANNEL=7
+
+POLAR=hor
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=45
+BEAMWIDTH=40
+CABLE=2
+HEIGTH=22
+
+EW3
+
+
+
Index: nodes/CNodeCamimplants/wleiden.conf
===================================================================
--- nodes/CNodeCamimplants/wleiden.conf	(revision 5875)
+++ nodes/CNodeCamimplants/wleiden.conf	(revision 5899)
@@ -39,5 +39,5 @@
 
 
-$config{'wi0'}=sprintf <<EW0;  # Locale Omni
+$config{'wi0'}=sprintf <<EW0;  # Lokale Omni
 TYPE=wireless
 IP=$master_ip/26
@@ -78,5 +78,5 @@
 MODE=managed
 ESSID=n-o.unigor.wleiden.net
-CHANNEL=1
+#CHANNEL=1
 
 POLAR=Hor
@@ -91,38 +91,38 @@
 EW1
 
-#$config{'wi2'}=sprintf <<EW2;  # Link naar Lijtweg3
-#TYPE=wireless
-#IP=172.16.0.126/30
-#DESC=Link naar Lijtweg3
-#SDESC=2lijtweg3
-#SPEED=11534336
-#POINT_TO_POINT=172.16.0.125
-#
-#MODE=managed
-#ESSID=il-z.lijtweg3.wleiden.net
+$config{'wi2'}=sprintf <<EW2;  # Link naar Lijtweg2
+TYPE=wireless
+IP=172.16.0.126/30
+DESC=Link naar Lijtweg2
+SDESC=2lijtweg2
+SPEED=11534336
+POINT_TO_POINT=172.16.0.125
+
+MODE=managed
+ESSID=il-z.lijtweg2.wleiden.net
 #CHANNEL=7
-#
-#POLAR=Hor
-#ANTENNA=PA4040
-#GAIN=15dBi
-#DIRECTION=270
-#BEAMWIDTH=40
-#CABLE=8
-#HEIGTH=17
-#
-#DHCP=no
-#EW2
 
-$config{'wi3'}=sprintf <<EW3;
+POLAR=Hor
+ANTENNA=PA4040
+GAIN=15dBi
+DIRECTION=270
+BEAMWIDTH=40
+CABLE=8
+HEIGTH=17
+
+DHCP=no
+EW2
+
+$config{'wi3'}=sprintf <<EW3; # Link naar DirkLos1
 TYPE=wireless
 IP=172.16.1.150/30
-DESC=Link naar Jorg
-SDESC=2jorg
+DESC=Link naar DirkLos1
+SDESC=2dirklos1
 SPEED=11534336
 POINT_TO_POINT=172.16.1.149
 
 MODE=managed
-ESSID=il-no.jorg.wleiden.net
-CHANNEL=13
+ESSID=il-w.dirklos1.wleiden.net
+#CHANNEL=13
 
 EW3
Index: nodes/CNodeDirkLos1/wleiden.conf
===================================================================
--- nodes/CNodeDirkLos1/wleiden.conf	(revision 5899)
+++ nodes/CNodeDirkLos1/wleiden.conf	(revision 5899)
@@ -0,0 +1,120 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeDirkLos1
+$location="Op Hogeschool, Zernikedreef, Leiden";
+$master_ip='172.16.175.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='DirkLos1';
+$release="6.0-RELEASE";
+$node_config_version="1";
+$genesis_control="YES";
+
+$OS='FreeBSD';
+$labelpos='left';
+
+$status='planned';
+
+# edugis x,y 92299,464748
+$X='092299';
+$Y='464748*';
+
+$config{'sis0'}=sprintf <<EE0;  # Local ethernet naar DirkLos2 met PoE
+TYPE=ethernet
+IP=172.16.3.56/30
+
+DESC=Local Ethernet naar DirkLos2
+SDESC=eth
+SPEED=102400000
+POINT_TO_POINT=172.16.3.57
+
+DHCP=no*
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+EE0
+
+$config{'wi0'}=sprintf <<EW0;  # link naar Camimplants
+TYPE=wireless
+IP=172.16.1.149/30
+
+DESC=Link naar Camimplants
+SDESC=2camimplants
+SPEED=11534336
+POINT_TO_POINT=172.16.1.150
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.1.150
+
+MODE=master
+ESSID=il-w.dirklos1.wleiden.net
+CHANNEL=13
+
+POLAR=Hor
+ANTENNA=SD15
+GAIN=15dBi
+DIRECTION=
+BEAMWIDTH=40
+
+DHCP=no
+
+EW0
+
+$config{'wi1'}=sprintf <<EW1;
+TYPE=wireless
+IP=172.16.3.26/30
+
+DESC=Link naar Vosko1
+SDESC=2vosko1
+SPEED=11534336
+POINT_TO_POINT=172.16.3.25
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.13
+
+MODE=managed
+ESSID=il-nw.vosko1.wleiden.net
+#CHANNEL=8
+
+POLAR=Hor
+ANTENNA=PA4040
+GAIN=15dBi
+DIRECTION=15
+BEAMWIDTH=70
+CABLE=2
+
+DHCP=no
+
+EW1
+
+$config{'ath0'}=sprintf <<EW2; 
+TYPE=wireless
+IP=172.16.3.60/30
+DESC=Link naar Lebkov
+SDESC=
+DHCP=no
+
+SPEED=11534336
+POINT_TO_POINT=172.16.3.61
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=il-o.dirklos1.wleiden.net
+CHANNEL=5
+
+POLAR=Hor
+ANTENNA=PA4040
+GAIN=15dBi
+DIRECTION=90
+BEAMWIDTH=70                                                                    
+CABLE=1
+
+EW2
+
+
Index: nodes/CNodeHL2/wleiden.conf
===================================================================
--- nodes/CNodeHL2/wleiden.conf	(revision 5875)
+++ nodes/CNodeHL2/wleiden.conf	(revision 5899)
@@ -4,10 +4,10 @@
 #  Read by /usr/local/sbin/wireless-up.pl
 #
-# config CNodeHL2
+# config CNodeDirkLos2
 $location="Op Hogeschool, Zernikedreef, Leiden";
 $master_ip='172.16.176.1';  
 $gw_open='closed';
 $nodetype='CNode';
-$nodename='HL2';
+$nodename='DirkLos2';
 $release="6.0-RELEASE";
 $node_config_version="1";
@@ -38,11 +38,11 @@
 SIS0
 
-$config{'sis1'}=sprintf <<SIS1;  # Local ethernet naar Node HL1 met PoE voor HL1
+$config{'sis1'}=sprintf <<SIS1;  # Local ethernet naar NodeDirkLos1 met PoE voor DirkLos1
 TYPE=ethernet
-IP=172.16.3.26/30
+IP=172.16.3.57/30
 
-DESC=Local Ethernet naar HL1
-SDESC=eth_to_HL1
-POINT_TO_POINT=172.163.25
+DESC=Local Ethernet naar DirkLos1
+SDESC=eth_to_DirkLos1
+POINT_TO_POINT=172.16.3.56
 SPEED=102400000
 
@@ -56,5 +56,5 @@
 $config{'sis2'}=sprintf <<SIS2;
 TYPE=IRIS ethernet
-IP=172.16.3.29/30
+IP=172.16.3.65/30
 
 DESC=Ethernet naar interlink west (unigor)
@@ -64,8 +64,8 @@
 DHCP=no
 
-POINT_TO_POINT=172.16.3.30
+POINT_TO_POINT=172.16.3.66
 
 MODE=master
-ESSID=il-w.hl2.wleiden.net
+ESSID=il-w.dirklos2.wleiden.net
 CHANNEL=165
 
@@ -100,5 +100,5 @@
 
 MODE=master
-ESSID=il-no.hl2.wleiden.net
+ESSID=il-no.dirklos2.wleiden.net
 CHANNEL=
 
@@ -129,7 +129,7 @@
 $config{'sis4'}=sprintf <<SIS4;
 TYPE=IRIS ethernet
-IP=172.16.3.45/30
+IP=172.16.3.46/30
 
-DESC=Ethernet naar interlink zuid-oost (stadhuis)
+DESC=Ethernet naar interlink zuid-oost (stadhuis2)
 SDESC=2Stadhuis
 SPEED=10240000000
@@ -137,9 +137,10 @@
 DHCP=no
 
-POINT_TO_POINT=172.16.3.46
+POINT_TO_POINT=172.16.3.45
 
 MODE=managed
-ESSID=il-zo.hl2.wleiden.net
+ESSID=il-nw.stadhuis2.wleiden.net
 #CHANNEL=36
+
 
 
@@ -182,5 +183,5 @@
 
 MODE=master
-ESSID=ap.hl2.wleiden.net
+ESSID=ap.DirkLos.wleiden.net
 CHANNEL=2
 CARD_OPTION=mode 11b
Index: nodes/CNodeHuub/wleiden.conf
===================================================================
--- nodes/CNodeHuub/wleiden.conf	(revision 5875)
+++ nodes/CNodeHuub/wleiden.conf	(revision 5899)
@@ -33,6 +33,4 @@
 
 DHCP=70-94
-
-
 
 OSPF_BROADCAST=no
Index: nodes/CNodeLijtweg1/wleiden.conf
===================================================================
--- nodes/CNodeLijtweg1/wleiden.conf	(revision 5875)
+++ nodes/CNodeLijtweg1/wleiden.conf	(revision 5899)
@@ -32,5 +32,5 @@
 DHCP=67-78
 SIS0
-$config{'sis1'}=sprintf <<SIS1;  # Ethernet naar lijtweg2
+$config{'sis0:0'}=sprintf <<SIS00;  # Ethernet naar lijtweg2
 TYPE=ethernet
 IP=172.16.253.1/29
@@ -47,5 +47,5 @@
 OSPF_NEIGHBORS=172.16.253.2
 
-SIS1
+SIS00
 
 
Index: nodes/CNodeLijtweg1/wleiden.conf.old
===================================================================
--- nodes/CNodeLijtweg1/wleiden.conf.old	(revision 5875)
+++ 	(revision )
@@ -1,137 +1,0 @@
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
-#
-# config CNodeLijtweg1
-$location="Lijtweg, Oegstgeest";
-$master_ip='172.23.12.1';  
-$AGGREGATE='24';
-
-$gw_open='closed';
-$nodetype='cnode';
-$nodename='Lijtweg1';
-$labelpos='left';
-
-$OS='FreeBSD';
-$status='up';
-
-$X=92344;
-$Y=466710+30;
-$N='';
-$E='';
-
-
-$config{'ep0'}=sprintf <<ED0;  # Ethernet nr nodes
-TYPE=ethernet
-IP=172.16.253.1/29
-
-
-DESC=Ethernet naar lijtweg nodes
-SDESC=eth0
-SPEED=10240000000
-POINT_TO_POINT=172.16.253.2 172.16.253.3
-
-#DHCP=66-78
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.253.2 172.16.253.3
-
-ED0
-
-$config{'wi0'}=sprintf <<EW0;  # ap-n
-TYPE=wireless
-IP=$master_ip/24
-
-DESC=omni
-SDESC=no
-SPEED=11534336
-
-DHCP=10-60
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=no
-
-MODE=master
-ESSID=ap-n.lijtweg1.wleiden.net
-CHANNEL=7
-
-POLAR=Ver
-ANTENNA=panel
-GAIN=14dBi
-DIRECTION=0
-BEAMWIDTH=40
-CABLE=0
-HEIGTH=35
-
-EW0
-
-$config{'wi1'}=sprintf <<EW1;  # link naar Rudi 
-TYPE=wireless
-IP=172.16.1.74/30
-DESC=Link naar Rudi
-SDESC=2rudi
-SPEED=11534336
-POINT_TO_POINT=172.16.1.73
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.73
-
-MODE=master 
-ESSID=il-w.lijtweg1.wleiden.net
-
-CHANNEL=1
-
-POLAR=Vert
-ANTENNA=SD15
-GAIN=13dBi
-DIRECTION=60
-BEAMWIDTH=40
-CABLE=1
-HEIGTH=35
-
-DHCP=no
-
-EW1
-
-$config{'wi1:0'}=sprintf <<EW10;  # link naar Hofwijck
-TYPE=wireless
-IP=172.16.1.81/30
-DESC=Link naar Hofwijck
-SDESC=2hofwijck
-SPEED=11534336
-POINT_TO_POINT=172.16.1.82
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.82
-
-DHCP=no
-
-EW10
-
-$config{'wi2'}=sprintf <<EW2; # link naar Katwijk, Meca
-TYPE=wireless
-IP=172.16.1.77/30
-DESC=Link naar Meca
-SDESC=2meca
-SPEED=11534336
-POINT_TO_POINT=172.16.1.78
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.78
-
-MODE=master
-ESSID=il-k.lijtweg1.wleiden.net
-CHANNEL=5
-
-POLAR=Hor
-ANTENNA=SD15
-GAIN=15dBi
-DIRECTION=270
-BEAMWIDTH=30
-CABLE=2
-HEIGTH=35
-
-DHCP=no
-
-EW2
-
Index: nodes/CNodeStadhuis2/wleiden.conf
===================================================================
--- nodes/CNodeStadhuis2/wleiden.conf	(revision 5875)
+++ nodes/CNodeStadhuis2/wleiden.conf	(revision 5899)
@@ -79,5 +79,5 @@
 
 
-$config{'ath0'}=sprintf <<EW1;
+$config{'ath0'}=sprintf <<ATH0;
 TYPE=wireless
 IP=172.16.1.221/30
@@ -104,7 +104,19 @@
 HEIGTH=
 
-EW1
+ATH0
 
-$config{'ath0:0'}=sprintf <<ATH1;
+$config{'ath0:0'}=sprintf <<ATH00;
+TYPE=11a
+IP=172.16.3.45/30
+
+DESC=Link naar DirkLos2
+SDESC=2DirkLos2
+SPEED=10240000000
+POINT_TO_POINT=172.16.3.46
+DHCP=no
+
+ATH00
+
+$config{'ath0:0'}=sprintf <<ATH01;
 TYPE=11a
 IP=172.16.2.109/30
@@ -114,11 +126,8 @@
 SPEED=10240000000
 POINT_TO_POINT=172.16.2.110
-
 DHCP=no
 
-ATH1
+ATH01
 
 
 
-
-
Index: nodes/CNodeVosko1/wleiden.conf
===================================================================
--- nodes/CNodeVosko1/wleiden.conf	(revision 5875)
+++ nodes/CNodeVosko1/wleiden.conf	(revision 5899)
@@ -78,5 +78,5 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;
+$config{'wi1'}=sprintf <<EW1; # Link naar cope
 TYPE=wireless
 IP=172.16.0.169/30
@@ -103,30 +103,15 @@
 EW1
 
-$config{'wi1:0'}=sprintf <<EW11;
+$config{'wi1:0'}=sprintf <<EW11; #Link naar DirkLos1
 TYPE=wireless
 IP=172.16.3.25/30
-DESC=Link naar HL1
+DESC=Link naar DirkLos1
 SDESC=2HL1
 SPEED=11534336
 POINT_TO_POINT=172.16.3.26
 
-DHCP=no
-
-MODE=master
-ESSID=il-nw.vosko1.wleiden.net
-
-CHANNEL=8
-
-POLAR=Hor
-ANTENNA=PA6060
-GAIN=8dBi
-DIRECTION=180
-BEAMWIDTH=60
-CABLE=6
-HEIGTH=45
-
 EW11
 
-$config{'wi2'}=sprintf <<EW2;
+$config{'wi2'}=sprintf <<EW2; #Link naar Huub
 TYPE=wireless
 IP=172.16.0.13/30
@@ -152,5 +137,5 @@
 EW2
 
-$config{'wi2:0'}=sprintf <<EW20;
+$config{'wi2:0'}=sprintf <<EW20; #Link naar RV
 TYPE=wireless
 IP=172.16.0.145/30