Index: nodes/CNodeGraficall/wleiden.conf
===================================================================
--- nodes/CNodeGraficall/wleiden.conf	(revision 3350)
+++ nodes/CNodeGraficall/wleiden.conf	(revision 3371)
@@ -108,15 +108,14 @@
 
 EW1
-
 $config{'wi2'}=sprintf <<EW2;  # IL NW 
 TYPE=wireless
-IP=172.16.1.6/30
-DESC=Link naar Hoogmade 
-SDESC=2hoogmade
+IP=172.16.3.1/30
+DESC=Link NW 
+SDESC=2NW
 SPEED=1153436
-POINT_TO_POINT=172.16.1.5
+POINT_TO_POINT=172.16.3.2
 
 OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.5
+OSPF_NEIGHBORS=172.16.3.2
 
 MODE=master
@@ -135,4 +134,5 @@
 
 EW2
+
 
 $config{'wi3'}=sprintf <<EW3;  # link naar NodeWBRotary
@@ -178,2 +178,14 @@
 EW30
 
+$config{'wi3:2'}=sprintf <<EW32;  # Link richting HMkerk2 
+TYPE=wireless
+IP=172.16.2.9/30
+DESC=Link naar HMKerk2 
+SDESC=2hmkerk2
+SPEED=1153436
+POINT_TO_POINT=172.16.2.10
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.2.10
+
+EW32
Index: nodes/CNodeHMKerk1/wleiden.conf
===================================================================
--- nodes/CNodeHMKerk1/wleiden.conf	(revision 3350)
+++ nodes/CNodeHMKerk1/wleiden.conf	(revision 3371)
@@ -90,19 +90,18 @@
 
 
-$config{'wi1'}=sprintf <<EW1;  # link naar Woubrugge (master)
+$config{'wi1'}=sprintf <<EW1;  # link naar Struykverwo (master)
 TYPE=wireless
-IP=172.16.1.146/30
-DESC=Link naar Woubrugge
-SDESC=2WBrotary
+IP=172.16.1.153/30
+DESC=Link naar Strykverwo
+SDESC=2struykverwo
 SPEED=11534336
-POINT_TO_POINT=172.16.1.145
-
+POINT_TO_POINT=172.16.1.154
 
 OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.145
+OSPF_NEIGHBORS=172.16.1.154
 
 MODE=master
 ESSID=il-o.hmkerk.wleiden.net
-CHANNEL=11
+CHANNEL=6
 
 POLAR=Hor
Index: nodes/CNodeHMKerk2/wleiden.conf
===================================================================
--- nodes/CNodeHMKerk2/wleiden.conf	(revision 3350)
+++ nodes/CNodeHMKerk2/wleiden.conf	(revision 3371)
@@ -59,37 +59,11 @@
 
 
-$config{'wi0'}=sprintf <<EW0;  # link naar Graficall
-TYPE=wireless
-IP=172.16.1.150/30
-DESC=Link naar Graficall
-SDESC=2graficall
-SPEED=11534336
-POINT_TO_POINT=172.16.1.9
 
 
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.9
-
-MODE=managed
-ESSID=il-n.graficall.wleiden.net
-CHANNEL=5
-
-POLAR=Vert
-ANTENNA=
-GAIN=8dBi
-DIRECTION=270
-BEAMWIDTH=80
-CABLE=1
-HEIGTH=20
-DHCP=no
-
-EW0
-
-
-$config{'wi1'}=sprintf <<EW1;  # link naar Kaag
+$config{'wi0'}=sprintf <<EW0;  # link naar SOM
 TYPE=wireless
 IP=172.16.1.153/30
-DESC=Link naar Kaag
-SDESC=2kaag
+DESC=Link naar SOM
+SDESC=2som
 SPEED=11534336
 POINT_TO_POINT=172.16.1.154
@@ -99,7 +73,7 @@
 OSPF_NEIGHBORS=172.16.1.154
 
-MODE=master
-ESSID=il-n.hmkerk.wleiden.net
-CHANNEL=5
+MODE=managed
+ESSID=il-o.som.wleiden.net
+#CHANNEL=5
 
 POLAR=Hor
@@ -114,4 +88,31 @@
 DHCP=no
 
+EW0
+
+$config{'wi1'}=sprintf <<EW0;  # link naar Graficall
+TYPE=wireless
+IP=172.16.2.11/30
+DESC=Link naar Graficall
+SDESC=2graficall
+SPEED=11534336
+POINT_TO_POINT=172.16.2.10
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.2.10
+
+MODE=managed
+ESSID=il-n.graficall.wleiden.net
+#CHNNEL=5
+
+POLAR=Vert
+ANTENNA=
+GAIN=8dBi
+DIRECTION=270
+BEAMWIDTH=80
+CABLE=1
+HEIGTH=20
+
+DHCP=no
+
 EW1
-
Index: nodes/CNodeLMdorp/wleiden.conf
===================================================================
--- nodes/CNodeLMdorp/wleiden.conf	(revision 3350)
+++ nodes/CNodeLMdorp/wleiden.conf	(revision 3371)
@@ -13,5 +13,5 @@
 $labelpos='left';
 
-$status='planned';
+$status='up';
 
 #$Real_X=103500;
@@ -54,7 +54,4 @@
 CHANNEL=1
 
-
-
-
 POLAR=Vert
 ANTENNA=omni
@@ -66,16 +63,40 @@
 EW0
 
-=fixme 172.166.*.* is niet in 172.16.0.0/12 !
+$config{'wi1'}=sprintf <<EW1;  # link naar LMKempers
+TYPE=wireless
+IP=172.16.0.194/30
+DESC=Link naar LMKempers
+SDESC=2kmprs
+PEED=11534336
+POINT_TO_POINT=172.16.0.193
 
-$config{'wi1'}=sprintf <<EW1;  # link naar NodeBilderdam
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.193
+
+MODE=managed
+ESSID=il-zw.kmprs.wleiden.net
+#CHANNEL=1
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=260
+BEAMWIDTH=0
+CABLE=1
+
+DHCP=no
+
+EW1
+
+$config{'wi2'}=sprintf <<EW2;  # link naar NodeBilderdam
 TYPE=wireless
-IP=172.166.0.129/30
+IP=172.16.2.13/30
 DESC=Link naar NodeBilderdam
 SDESC=2henk
 SPEED=11534336
-POINT_TO_POINT=172.166.0.130
+POINT_TO_POINT=172.16.2.14
 
 OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.166.0.130
+OSPF_NEIGHBORS=172.16.2.14
 
 MODE=master
@@ -92,5 +113,4 @@
 DHCP=no
 
-EW1
+EW2
 
-=cut
Index: nodes/CNodeLMkempers1/wleiden.conf
===================================================================
--- nodes/CNodeLMkempers1/wleiden.conf	(revision 3350)
+++ nodes/CNodeLMkempers1/wleiden.conf	(revision 3371)
@@ -50,19 +50,19 @@
 ED1
 
-$config{'wi0'}=sprintf <<EW0;  # link SOM 
+$config{'wi0'}=sprintf <<EW0;  # Link naar LMDorp 
 TYPE=wireless
-IP=172.16.0.58/30
-DESC=Link naar SOM 
-SDESC=2som
+IP=172.16.193/30
+DESC=Link naar LMDorp 
+SDESC=2lmdorp
 SPEED=11534336
-POINT_TO_POINT=172.16.0.57
+POINT_TO_POINT=172.16.0.194
 
 
 OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.0.57
+OSPF_NEIGHBORS=172.16.0.194
 
-MODE=managed
-ESSID=il-o.som.wleiden.net
-#CHANNEL=1
+MODE=master
+ESSID=il-zw.kmprs.wleiden.net
+CHANNEL=1
 
 POLAR=Vert
@@ -76,4 +76,21 @@
 
 EW0
+
+$config{'wi0:0'}=sprintf << EW00; #link naar strykverwo
+TYPE=wireless
+IP=172.16.1.205/30
+
+DESC=Link naar strykverwo2
+SDESC=2strykverwo
+
+SPEED=11534336
+POINT_TO_POINT=172.16.1.206
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.1.206
+
+DHCP=no
+
+EW00
 
 $config{'wi1'}=sprintf <<EW1;  # link kempers naar hoofddorp
Index: nodes/CNodeLMstruykverwo1/wleiden.conf
===================================================================
--- nodes/CNodeLMstruykverwo1/wleiden.conf	(revision 3350)
+++ nodes/CNodeLMstruykverwo1/wleiden.conf	(revision 3371)
@@ -13,5 +13,5 @@
 $labelpos='left';
 
-$status='planned';
+$status='up';
 
 #$Real_X=103500;
@@ -65,5 +65,33 @@
 ED0
 
-$config{'wi0'}=sprintf <<EW0;  # OMNI
+
+$config{'wi0'}=sprintf <<EW0;  # link Hoogmade kerk - Struyk Verwo
+TYPE=wireless
+IP=172.16.1.153/30
+DESC=Link naar NodeHMkerk
+SDESC=2hoogmade
+SPEED=11534336
+POINT_TO_POINT=172.16.1.154
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.1.154
+
+MODE=managed
+ESSID=il-o.hmkerk.wleiden.net
+#CHANNEL=13
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=15dBi
+DIRECTION=280
+BEAMWIDTH=40
+CABLE=1
+HEIGTH=17
+DHCP=no
+
+EW0
+
+$config{'wi1'}=sprintf <<EW1; # OMNI
 TYPE=wireless
 IP=$master_ip/26
@@ -90,49 +118,21 @@
 HEIGTH=17
 
-EW0
+EW1
 
-$config{'wi1'}=sprintf <<EW1;  # link Hoogmade kerk - Struyk Verwo
+$config{'wi2'}=sprintf <<EW2;  # link wbrotary struyk Verwo
 TYPE=wireless
-IP=172.16.1.186/30
-DESC=Link naar NodeHMkerk
-SDESC=2hoogmade
+IP=172.16.1.134/30
+DESC=Link naar WBrotary
+SDESC=2WBrotary
 SPEED=11534336
-POINT_TO_POINT=172.16.1.185
+POINT_TO_POINT=172.16.1.135
 
 
 OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.185
+OSPF_NEIGHBORS=172.16.1.135
 
 MODE=managed
-ESSID=il-o.hmkerk.wleiden.net
-CHANNEL=13
-
-POLAR=Vert
-ANTENNA=SD15
-GAIN=15dBi
-DIRECTION=280
-BEAMWIDTH=40
-CABLE=1
-HEIGTH=17
-DHCP=no
-
-EW1
-
-
-$config{'wi2'}=sprintf <<EW2;  # link wbrotary struyk Verwo
-TYPE=wireless
-IP=172.16.1.190/30
-DESC=Link naar WBrotary
-SDESC=2WBrotary
-SPEED=11534336
-POINT_TO_POINT=172.16.1.189
-
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.189
-
-MODE=managed
-ESSID=il-n.wbrotary.wleiden.net
-CHANNEL=5
+ESSID=il-no.wbrotary.wleiden.net
+#CHANNEL=13
 
 POLAR=Hor
@@ -144,6 +144,6 @@
 HEIGTH=17
 
-
 DHCP=no
 
 EW2
+
Index: nodes/CNodeLMstruykverwo2/wleiden.conf
===================================================================
--- nodes/CNodeLMstruykverwo2/wleiden.conf	(revision 3350)
+++ nodes/CNodeLMstruykverwo2/wleiden.conf	(revision 3371)
@@ -81,17 +81,17 @@
 $config{'wi1'}=sprintf <<EW1;  # Interlink kempers - struykverwo
 TYPE=wireless
-IP=172.16.1.193/30
+IP=172.16.1.206/30
 DESC=Link naar kempers
 SDESC=2kempers
 SPEED=11534336
-POINT_TO_POINT=172.16.1.194
+POINT_TO_POINT=172.16.1.205
 
 
 OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.194
+OSPF_NEIGHBORS=172.16.1.205
 
 MODE=managed
 ESSID=il-zw.kmprs.wleiden.net
-CHANNEL=1
+#CHANNEL=1
 
 POLAR=Hor
Index: nodes/CNodeSOM/wleiden.conf
===================================================================
--- nodes/CNodeSOM/wleiden.conf	(revision 3350)
+++ nodes/CNodeSOM/wleiden.conf	(revision 3371)
@@ -100,9 +100,9 @@
 EW1
 
-$config{'wi1:0'}=sprintf <<EW10; #link naar LMkempers1
+$config{'wi1:0'}=sprintf <<EW10; #link naar HMKerk1
 TYPE=wireless
 IP=172.16.0.57/30
-DESC=Link naar LMkempers1
-SDESC=2LMkempers1
+DESC=Link naar HMKerk1
+SDESC=2HMKerk1
 SPEED=11535336
 POINT_TO_POINT=172.16.0.58
Index: nodes/CNodeWBRotary1/wleiden.conf
===================================================================
--- nodes/CNodeWBRotary1/wleiden.conf	(revision 3350)
+++ nodes/CNodeWBRotary1/wleiden.conf	(revision 3371)
@@ -144,19 +144,2 @@
 EW2
 
-$config{'wi2:0'}=sprintf <<EW20;  # link naar HMKerk
-TYPE=wireless
-IP=172.16.1.145/30
-DESC=Link naar HMKerk
-SDESC=2hmkerk
-SPEED=11534336
-POINT_TO_POINT=172.16.1.146
-
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.146
-
-
-DHCP=no
-
-EW20
-
Index: nodes/CNodeWBRotary2/wleiden.conf
===================================================================
--- nodes/CNodeWBRotary2/wleiden.conf	(revision 3350)
+++ nodes/CNodeWBRotary2/wleiden.conf	(revision 3371)
@@ -86,9 +86,9 @@
 
 
-$config{'wi1'}=sprintf <<EW1;  # link naar Leimuiden
+$config{'wi1'}=sprintf <<EW1;  # link naar Stuykwo
 TYPE=wireless
 IP=172.16.1.133/30
-DESC=Link naar leimuiden
-SDESC=2leimuiden
+DESC=Link naar struykwo
+SDESC=2struykwo
 SPEED=11534336
 POINT_TO_POINT=172.16.1.134