Index: nodes/CNodeHofwijck/wleiden.conf
===================================================================
--- nodes/CNodeHofwijck/wleiden.conf	(revision 2513)
+++ 	(revision )
@@ -1,133 +1,0 @@
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
-#
-# config CNodeHofwijck
-$location="Zorgcentrum, Oranjelaan 38, 2341cc,Oegstgeest";
-$master_ip='172.23.116.1';  
-$AGGREGATE='21';
-
-$gw_open='closed';
-$nodetype='cnode';
-$nodename='Hofwijck';
-$labelpos='right';
-
-$OS='FreeBSD';
-
-
-$X=92796;
-$Y=466638;
-$N='';
-$E='';
-
-
-$config{'ep0'}=sprintf <<ED0;  # Ethernet
-TYPE=ethernet
-IP=172.23.16.65/28
-
-
-DESC=Ethernet naar hofwijck
-SDESC=eth0
-SPEED=10240000000
-POINT_TO_POINT=
-
-DHCP=66-78
-
-
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=no
-
-
-ED0
-
-$config{'wi0'}=sprintf <<EW0;  # omni
-TYPE=wireless
-IP=$master_ip/26
-
-DESC=omni
-SDESC=no
-SPEED=11534336
-
-DHCP=10-60
-#DHCP_STATIC=  host marcel{hardware ethernet 00:02:6F:03:BB:C9; fixed-address 172.21.0.5;}  host joop{hardware ethernet 00:06:25:A7:17:0C; fixed-address 172.21.0.6;} 
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=no
-
-MODE=master
-ESSID=ap-omni.hofwijck.wleiden.net
-CHANNEL=1
-
-POLAR=Ver
-ANTENNA=omni
-GAIN=6dBi
-DIRECTION=omni
-BEAMWIDTH=360
-CABLE=0
-HEIGTH=35
-
-EW0
-
-
-$config{'wi1'}=sprintf <<EW1;  # Link naar azc
-TYPE=wireless
-IP=172.16.1.94/30
-
-DESC=Link naar azc
-SDESC=2azc
-SPEED=11534336
-
-DHCP=no
-#DHCP_STATIC= host ipaq1{hardware ethernet 00:02:2D:0E:4F:0D; fixed-address 172.18.8.2;} host ipaq2{hardware ethernet 00:02:2D:09:21:28; fixed-address 172.18.8.3;}
-
-POINT_TO_POINT=172.16.1.93
-
-SPEED=11534336
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.93
-
-MODE=managed
-ESSID=il-nw.azc.wleiden.net
-#CHANNEL=6
-
-
-POLAR=Ver
-ANTENNA=panel
-GAIN=14dBi
-DIRECTION=70
-BEAMWIDTH=40
-HEIGTH=35
-CABLE=0
-
-EW1
-
-$config{'wi2'}=sprintf <<EW2;  # link naar Lijtweg
-TYPE=wireless
-IP=172.16.1.82/30
-DESC=Link naar Lijtweg
-SDESC=2lijtweg
-SPEED=11534336
-POINT_TO_POINT=172.16.1.81
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.1.81
-
-MODE=managed
-ESSID=il-no.lijtweg.wleiden.net
-
-#CHANNEL=11
-
-POLAR=Vert
-ANTENNA=Patch
-GAIN=15dBi
-DIRECTION=45
-BEAMWIDTH=40
-CABLE=1
-HEIGTH=35
-
-DHCP=no
-
-EW2
-
Index: nodes/CNodeHofwijck/wleiden.conf.is-er-nog-niet
===================================================================
--- nodes/CNodeHofwijck/wleiden.conf.is-er-nog-niet	(revision 2527)
+++ nodes/CNodeHofwijck/wleiden.conf.is-er-nog-niet	(revision 2527)
@@ -0,0 +1,133 @@
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeHofwijck
+$location="Zorgcentrum, Oranjelaan 38, 2341cc,Oegstgeest";
+$master_ip='172.23.116.1';  
+$AGGREGATE='21';
+
+$gw_open='closed';
+$nodetype='cnode';
+$nodename='Hofwijck';
+$labelpos='right';
+
+$OS='FreeBSD';
+
+
+$X=92796;
+$Y=466638;
+$N='';
+$E='';
+
+
+$config{'ep0'}=sprintf <<ED0;  # Ethernet
+TYPE=ethernet
+IP=172.23.16.65/28
+
+
+DESC=Ethernet naar hofwijck
+SDESC=eth0
+SPEED=10240000000
+POINT_TO_POINT=
+
+DHCP=66-78
+
+
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+
+ED0
+
+$config{'wi0'}=sprintf <<EW0;  # omni
+TYPE=wireless
+IP=$master_ip/26
+
+DESC=omni
+SDESC=no
+SPEED=11534336
+
+DHCP=10-60
+#DHCP_STATIC=  host marcel{hardware ethernet 00:02:6F:03:BB:C9; fixed-address 172.21.0.5;}  host joop{hardware ethernet 00:06:25:A7:17:0C; fixed-address 172.21.0.6;} 
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+MODE=master
+ESSID=ap-omni.hofwijck.wleiden.net
+CHANNEL=1
+
+POLAR=Ver
+ANTENNA=omni
+GAIN=6dBi
+DIRECTION=omni
+BEAMWIDTH=360
+CABLE=0
+HEIGTH=35
+
+EW0
+
+
+$config{'wi1'}=sprintf <<EW1;  # Link naar azc
+TYPE=wireless
+IP=172.16.1.94/30
+
+DESC=Link naar azc
+SDESC=2azc
+SPEED=11534336
+
+DHCP=no
+#DHCP_STATIC= host ipaq1{hardware ethernet 00:02:2D:0E:4F:0D; fixed-address 172.18.8.2;} host ipaq2{hardware ethernet 00:02:2D:09:21:28; fixed-address 172.18.8.3;}
+
+POINT_TO_POINT=172.16.1.93
+
+SPEED=11534336
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.1.93
+
+MODE=managed
+ESSID=il-nw.azc.wleiden.net
+#CHANNEL=6
+
+
+POLAR=Ver
+ANTENNA=panel
+GAIN=14dBi
+DIRECTION=70
+BEAMWIDTH=40
+HEIGTH=35
+CABLE=0
+
+EW1
+
+$config{'wi2'}=sprintf <<EW2;  # link naar Lijtweg
+TYPE=wireless
+IP=172.16.1.82/30
+DESC=Link naar Lijtweg
+SDESC=2lijtweg
+SPEED=11534336
+POINT_TO_POINT=172.16.1.81
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.1.81
+
+MODE=managed
+ESSID=il-no.lijtweg.wleiden.net
+
+#CHANNEL=11
+
+POLAR=Vert
+ANTENNA=Patch
+GAIN=15dBi
+DIRECTION=45
+BEAMWIDTH=40
+CABLE=1
+HEIGTH=35
+
+DHCP=no
+
+EW2
+