Index: /nodes/CNodeAMWaterT1/wleiden.conf
===================================================================
--- /nodes/CNodeAMWaterT1/wleiden.conf	(revision 6022)
+++ /nodes/CNodeAMWaterT1/wleiden.conf	(revision 6023)
@@ -27,5 +27,5 @@
 #IP=172.25.80.65/29
 
-DESC=Ethernet poort kempers1
+DESC=Ethernet poort watertoren1
 SDESC=eth
 SPEED=10240000000
@@ -38,5 +38,5 @@
 ED0
 
-$config{'sis1'}=sprintf <<ED1;  # eth poort 1 naar node wtrt2 
+$config{'sis1'}=sprintf <<ED1;  # ethernet poort 1 naar node watertoren2 
 TYPE=ethernet
 #IP=172.16.1.201/30
@@ -48,8 +48,8 @@
 DHCP=no
 
-POINT_TO_POINT=172.16.1.202
+#POINT_TO_POINT=172.16.1.202
 
 OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.202
+#OSPF_NEIGHBORS=172.16.1.202
 
 ED1
@@ -61,11 +61,11 @@
 SDESC=2lmkmprs
 SPEED=11534336
-POINT_TO_POINT=172.16.1.194
+#POINT_TO_POINT=172.16.1.194
 
 
 OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.194
+#OSPF_NEIGHBORS=172.16.1.194
 
-MODE=master
+MODE=slave
 ESSID=il-w.kmprs.wleiden.net
 CHANNEL=1
@@ -82,30 +82,30 @@
 EW0
 
-#$config{'wi1'}=sprintf <<EW1;  # link kempers naar hoofddorp
-#TYPE=wireless
+$config{'wi1'}=sprintf <<EW1;  # link Gemhuis Aalsmeer
+TYPE=wireless
 #IP=172.16.1.209/30
-#DESC=Link naar hoofddorp
-#SDESC=2hfddrp
-#SPEED=11534336
+DESC=Link naar Gem Huis Aalsmeer
+SDESC=2amgemhuis
+SPEED=11534336
 #POINT_TO_POINT=172.16.1.210
-#
-#
-#OSPF_BROADCAST=no
-#OSPF_NEIGHBORS=172.16.1.210
-#
-#MODE=master
-#ESSID=il-n.kmprs.wleiden.net
-#CHANNEL=9
-#
-#POLAR=Vert
-#ANTENNA=SD15
-#GAIN=15dBi
-#DIRECTION=280
-#BEAMWIDTH=40
-#CABLE=1
-#HEIGTH=17
-#DHCP=no
-#
-#EW1
 
 
+OSPF_BROADCAST=no
+#OSPF_NEIGHBORS=172.16.1.210
+
+MODE=master
+ESSID=il-no.amwtrt.wleiden.net
+CHANNEL=9
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=15dBi
+DIRECTION=280
+BEAMWIDTH=40
+CABLE=1
+HEIGTH=17
+DHCP=no
+
+EW1
+
+
Index: /nodes/CNodeAMwaterT2/wleiden.conf
===================================================================
--- /nodes/CNodeAMwaterT2/wleiden.conf	(revision 6023)
+++ /nodes/CNodeAMwaterT2/wleiden.conf	(revision 6023)
@@ -0,0 +1,111 @@
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeAMWaterT2
+$location="Aalsmeer Watertoren Node2";
+#$master_ip='172.25.80.65';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='AMwtrt2';
+$release="5.0-RELEASE";
+$node_config_version="1";
+$genesis_control="YES";
+
+$OS='FreeBSD';
+$labelpos='left';
+
+$status='up';
+
+# edugis x,y 107030,471206
+$X='107030';
+$Y='471206';
+
+$AGGREGATE=22;
+
+$config{'sis0'}=sprintf <<ED0;  # ethernet poort 0 Soekris
+TYPE=ethernet
+#IP=172.25.80.65/29
+
+DESC=Ethernet poort 0 van watertoren 2
+SDESC=eth
+SPEED=10240000000
+
+DHCP=no
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+$config{'sis1'}=sprintf <<ED1;  # ethernet poort 1 naar node watertoren 1 
+TYPE=ethernet
+#IP=172.16.1.201/30
+
+DESC=Ethernet naar watertoren 1
+SDESC=2wtrt2
+SPEED=10240000000
+
+DHCP=no
+
+#POINT_TO_POINT=172.16.1.202
+
+OSPF_BROADCAST=no
+#OSPF_NEIGHBORS=172.16.1.202
+
+ED1
+
+$config{'wi0'}=sprintf <<EW0;  # Link naar NOG onbekend
+TYPE=wireless
+#IP=172.16.1.193/30
+DESC=Link naar onbekend
+SDESC=2onbekend
+SPEED=11534336
+#POINT_TO_POINT=172.16.1.194
+
+
+OSPF_BROADCAST=no
+#OSPF_NEIGHBORS=172.16.1.194
+
+MODE=master
+ESSID=il-w.amwtrt.wleiden.net
+CHANNEL=1
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=15dBi
+DIRECTION=280
+BEAMWIDTH=40
+CABLE=1
+HEIGTH=17
+DHCP=no
+
+EW0
+
+$config{'wi1'}=sprintf <<EW1;  # link naar onbekend
+TYPE=wireless
+#IP=172.16.1.209/30
+DESC=Link naar onbekend
+SDESC=2onbekend
+SPEED=11534336
+#POINT_TO_POINT=172.16.1.210
+
+
+OSPF_BROADCAST=no
+#OSPF_NEIGHBORS=172.16.1.210
+
+MODE=master
+ESSID=il-no.amonbekend.wleiden.net
+CHANNEL=9
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=15dBi
+DIRECTION=280
+BEAMWIDTH=40
+CABLE=1
+HEIGTH=17
+DHCP=no
+
+EW1
+
+