Index: /nodes/CNodeCeTIM2/wleiden.conf
===================================================================
--- /nodes/CNodeCeTIM2/wleiden.conf	(revision 906)
+++ /nodes/CNodeCeTIM2/wleiden.conf	(revision 918)
@@ -203,5 +203,5 @@
 EW10
 
-$config{'wi1:1'}=sprintf <<EW11;  # link naar RV
+$config{'wi1:1'}=<<EOS;  # link naar RV
 TYPE=wireless
 IP=172.16.0.133/30
@@ -211,10 +211,21 @@
 POINT_TO_POINT=172.16.0.134
 
-
-
-
 OSPF_BROADCAST=no
 OSPF_NEIGHBORS=172.16.0.134
 
 DHCP=no
-EW11
+EOS
+
+$config{'wi1:'}=<<EOS;  # link naar dirkx
+TYPE=wireless
+IP=172.16.0.53/30
+DESC=Link naar Dirkx
+SDESC=2dirkx
+SPEED=11534336
+POINT_TO_POINT=172.16.0.54
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.54
+
+DHCP=no
+EOS
Index: /nodes/CNodeDirkx/wleiden.conf
===================================================================
--- /nodes/CNodeDirkx/wleiden.conf	(revision 906)
+++ /nodes/CNodeDirkx/wleiden.conf	(revision 918)
@@ -6,5 +6,5 @@
 # config CNodeDirkx
 
-$location="Tegenover Kamerling Onnes Lab, Particulier Dak.";
+$location="Hoek Nieuwsteeg/Zonneveldstraat, Particulier Dak.";
 $master_ip='172.17.32.1';  
 $gw_open='closed';
@@ -14,34 +14,22 @@
 $DISK='FLASH';
 
-
-
-
-
-
 $X='093551';
 $Y='463548';
 
-
-$config{'sis0'}=sprintf <<ED0;  # eth
+$config{'sis0'}=<<EOS;  # eth
 TYPE=ethernet
 IP=172.17.32.65/29
 
-ROUTE=0.0.0.0/0 172.17.32.2		# dirkx/san-jose2Leiden
-
-DESC=Ethernet naar buitenste Leiden/SanJose/SanDiego en HCC backup router
+DESC=Ethernet naar beneden
 SDESC=eth0
 SPEED=10240000000
 
-#DHCP=68-70
-DHCP=no
-
-
+DHCP=68-70
 
 OSPF_BROADCAST=no
 OSPF_NEIGHBORS=no
+EOS
 
-ED0
-
-$config{'wi0'}=sprintf <<EW0;  # OMNI
+$config{'wi0'}=<<EOS;  # OMNI
 TYPE=wireless
 IP=$master_ip/26
@@ -53,6 +41,4 @@
 DHCP=10-60
 
-
-
 OSPF_BROADCAST=no
 OSPF_NEIGHBORS=no
@@ -62,7 +48,4 @@
 CHANNEL=9
 
-
-
-
 POLAR=Vert
 ANTENNA=omni
@@ -70,21 +53,15 @@
 DIRECTION=omni
 BEAMWIDTH=360
-CABLE=0
-HEIGTH=12
+CABLE=5
+HEIGTH=15
+EOS
 
-EW0
-
-
-
-$config{'wi1'}=sprintf <<EW1;  # link naar imi
+$config{'wi1'}=<<EOS;  # link naar cetim2
 TYPE=wireless
 IP=172.16.0.54/30
-DESC=Link naar imi
-SDESC=2imi
+DESC=Link naar cetim
+SDESC=2cetim
 SPEED=11534336
 POINT_TO_POINT=172.16.0.53
-
-
-
 
 OSPF_BROADCAST=no
@@ -92,20 +69,15 @@
 
 MODE=managed
-ESSID=omni.imi0.wleiden.net
+ESSID=il-zw.cetim2.wleiden.net
 CHANNEL=5
 
-
-
-POLAR=Vert
-ANTENNA=SD15
+POLAR=Horz
+ANTENNA=SD21
 GAIN=13dBi
-DIRECTION=235
-BEAMWIDTH=35
-CABLE=1
-HEIGTH=12
+DIRECTION=115
+BEAMWIDTH=30
+CABLE=5
+HEIGTH=14
 
 DHCP=no
-
-EW1
-
-
+EOS
Index: /nodes/CNodeIMI/wleiden.conf
===================================================================
--- /nodes/CNodeIMI/wleiden.conf	(revision 906)
+++ /nodes/CNodeIMI/wleiden.conf	(revision 918)
@@ -76,22 +76,4 @@
 EW0
 
-
-$config{'wi0:0'}=sprintf <<EW00;  # link naar dirkx
-TYPE=wireless
-IP=172.16.0.53/30
-DESC=Link naar Dirkx
-SDESC=2dirkx
-SPEED=11534336
-POINT_TO_POINT=172.16.0.54
-
-
-
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.0.54
-
-DHCP=no
-EW00
-
 $config{'wi0:1'}=sprintf <<EW01;  # link naar Lvl-z
 TYPE=wireless