Index: nodes/CNodeKaag/wleiden.conf
===================================================================
--- nodes/CNodeKaag/wleiden.conf	(revision 2256)
+++ nodes/CNodeKaag/wleiden.conf	(revision 2257)
@@ -21,4 +21,7 @@
 $Y=469754;
 
+$Real_X=94764;
+$Real_Y=466700;
+                                                                                
 $N='';
 $E='';
Index: nodes/CNodeMeca/wleiden.conf
===================================================================
--- nodes/CNodeMeca/wleiden.conf	(revision 2256)
+++ nodes/CNodeMeca/wleiden.conf	(revision 2257)
@@ -17,5 +17,5 @@
 $Y='466800';
 
-$Real_X=86890;
+$Real_X=86890-90;
 $Real_Y=468428;
 
@@ -41,5 +41,36 @@
 ED0
 
-$config{'wi0'}=sprintf <<EW0;  # Omni voor de buurt
+$config{'wi0'}=sprintf <<EW0;  # link naar AZC
+TYPE=wireless
+IP=172.16.0.186/30
+DESC=Link naar AZC
+SDESC=2azc
+SPEED=11534336
+POINT_TO_POINT=172.16.0.185
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.185
+
+MODE=managed
+ESSID=ap-nw.azc.wleiden.net
+
+CHANNEL=6
+
+POLAR=Hor
+ANTENNA=SD27
+GAIN=27dBi
+DIRECTION=145
+BEAMWIDTH=10
+CABLE=2
+HEIGTH=22
+
+DHCP=no
+
+EW0
+
+
+
+
+$config{'wi1'}=sprintf <<EW1;  # Omni voor de buurt
 TYPE=wireless
 IP=$master_ip/26
@@ -67,8 +98,8 @@
 HEIGTH=12
 
-EW0
+EW1
 
 
-$config{'wi0:0'}=sprintf <<EW00; 
+$config{'wi1:0'}=sprintf <<EW10; 
 TYPE=wireless
 IP=172.16.1.101/30
@@ -80,33 +111,34 @@
 OSPF_NEIGHBORS=172.16.1.102
 DHCP=no
-EW00
+EW10
 
 
-$config{'wi1'}=sprintf <<EW1;  # link naar AZC
+
+$config{'wi2'}=sprintf <<EW2;  # Interlink naar VAIPS
 TYPE=wireless
-IP=172.16.0.186/30
-DESC=Link naar AZC
-SDESC=2azc
+IP=172.16.1.113/30
+DESC=Link naar VAIPS
+SDESC=2vaips
 SPEED=11534336
-POINT_TO_POINT=172.16.0.185
 
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.0.185
-
-MODE=managed
-ESSID=ap-nw.azc.wleiden.net
-
-CHANNEL=6
-
-POLAR=Hor
-ANTENNA=SD27
-GAIN=27dBi
-DIRECTION=145
-BEAMWIDTH=10
-CABLE=2
-HEIGTH=22
+#OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
 
 DHCP=no
 
-EW1
+MODE=master
+ESSID=il-n.meca.wleiden.net
 
+CHANNEL=11
+
+POLAR=Hor
+ANTENNA=SD-15
+GAIN=13dBi
+DIRECTION=50
+BEAMWIDTH=40
+CABLE=3
+HEIGTH=12
+
+EW2
+
+
Index: nodes/CNodeVAIPS/wleiden.conf
===================================================================
--- nodes/CNodeVAIPS/wleiden.conf	(revision 2257)
+++ nodes/CNodeVAIPS/wleiden.conf	(revision 2257)
@@ -0,0 +1,100 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeVAIPS
+
+$location='Katwijk';
+$master_ip='172.26.8.1';  
+$gw_open='closed';
+$nodetype='cnode';
+$nodename='VAIPS';
+
+$OS='FreeBSD';
+$labelpos='right';
+
+$X='90150';
+$Y='466900';
+
+$Real_X=86890;
+$Real_Y=468428;
+
+$N='';
+$E='';
+
+$config{'sis0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.26.8.65/28
+
+
+DESC=Ethernet naar VAIPS
+SDESC=2vaips
+SPEED=10240000000
+
+DHCP=70-78
+#DHCP_STATIC=host jiskefet{hardware ethernet 00:00:24:c0:a5:4c; fixed-address 172.26.0.69;} 
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+
+
+
+$config{'wi0'}=sprintf <<EW0;  # Omni voor de buurt
+TYPE=wireless
+IP=$master_ip/26
+DESC=Omni voor de buurt
+SDESC=omni
+SPEED=11534336
+
+#OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+#DHCP=no
+DHCP=10-60
+
+MODE=master
+ESSID=ap-omni.vaips.wleiden.net
+
+CHANNEL=6
+
+POLAR=Vert
+ANTENNA=omni
+GAIN=6dBi
+DIRECTION=0
+BEAMWIDTH=360
+CABLE=1
+HEIGTH=12
+
+EW0
+
+$config{'wi1'}=sprintf <<EW1;  # link naar Meca
+TYPE=wireless
+IP=172.16.1.114/30
+DESC=Link naar Meca
+SDESC=2meca
+SPEED=11534336
+POINT_TO_POINT=172.16.1.113
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.1.113
+
+MODE=managed
+ESSID=il-n.meca.wleiden.net
+
+CHANNEL=11
+
+POLAR=Hor
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=210
+BEAMWIDTH=40
+CABLE=2
+HEIGTH=12
+
+DHCP=no
+
+EW1