Index: /nodes/CNodeLMcederplein/wleiden.conf
===================================================================
--- /nodes/CNodeLMcederplein/wleiden.conf	(revision 4190)
+++ /nodes/CNodeLMcederplein/wleiden.conf	(revision 4190)
@@ -0,0 +1,112 @@
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeLMCederplein
+$location="Cederplein Leimuiden";
+$master_ip='172.25.42.1';  
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='LMCederplein';
+$OS='FreeBSD';
+$labelpos='left';
+
+$status='planned';
+
+# GPS Coordinaten N 53 13.317
+#                 E  4 39.949
+$X='0';
+$Y='9';
+
+$LOCATION='Cederplein Leimuiden';
+
+$config{'sis0'}=sprintf <<ED0;  # eth
+TYPE=ethernet
+IP=172.25.42.65/29
+
+DESC=Ethernet naar gebruiker 
+SDESC=eth
+SPEED=10240000000
+DHCP=68-70
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+ED0
+
+$config{'wi0'}=sprintf <<EW0;  # OMNI voor de buurt + bibliobus
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=AP voor de buurt
+SDESC=ap-omni
+SPEED=11534336
+
+DHCP=10-60
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=ap.LMcederplein.wleiden.net
+CHANNEL=1
+
+POLAR=Vert
+ANTENNA=omni
+GAIN=8dBi
+DIRECTION=
+BEAMWIDTH=360
+CABLE=0
+
+EW0
+
+$config{'wi1'}=sprintf <<EW1;  # link naar lmdorp
+TYPE=wireless
+IP=172.16.x.x/30
+DESC=Link naar LMdorp
+SDESC=2lmdorp
+SPEED=11534336
+POINT_TO_POINT=172.16.x.x
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.x.x
+
+MODE=managed
+ESSID=il-zo.lmdorp.wleiden.net
+CHANNEL=13
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=260
+BEAMWIDTH=0
+CABLE=1
+
+DHCP=no
+
+EW1
+
+$config{'wi2'}=sprintf <<EW2;  # link naar struyk Verwo
+TYPE=wireless
+IP=172.16.x.x/30
+DESC=Link naar LMstrkvrw
+SDESC=2lmstrkvrw
+SPEED=11534336
+POINT_TO_POINT=172.16.x.x
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.x.x
+
+MODE=master
+ESSID=il-x.x.wleiden.net
+CHANNEL=1
+
+POLAR=Vert
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=260
+BEAMWIDTH=0
+CABLE=1
+
+DHCP=no
+
+EW2
Index: /nodes/CNodeWBRotary2/wleiden.conf
===================================================================
--- /nodes/CNodeWBRotary2/wleiden.conf	(revision 4189)
+++ /nodes/CNodeWBRotary2/wleiden.conf	(revision 4190)
@@ -86,15 +86,19 @@
 
 
+<<<<<<< .mine
+$config{'wi1'}=sprintf <<EW1;  # link naar Struyk Verwo
+=======
 $config{'wi1'}=sprintf <<EW1;  # link naar Stuykwo
+>>>>>>> .r3428
 TYPE=wireless
-IP=172.16.1.133/30
+IP=172.16.1.189/30
 DESC=Link naar struykwo
 SDESC=2struykwo
 SPEED=11534336
-POINT_TO_POINT=172.16.1.134
+POINT_TO_POINT=172.16.1.190
 
 
 OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.134
+OSPF_NEIGHBORS=172.16.1.190
 
 MODE=master