Index: nodes/CNodeStadhuis/wleiden.conf
===================================================================
--- nodes/CNodeStadhuis/wleiden.conf	(revision 10116)
+++ 	(revision )
@@ -1,219 +1,0 @@
-$location="Stadhuis, Stadhuisplein 1, 2311 EJ, Leiden";
-$master_ip='172.17.141.1';
-$nodetype='CNode';
-$nodename='Stadhuis';
-$release="8.2-RELEASE";
-$ileiden='yes';
-$X='93670';
-$Y='463699';
-$status='up';
-
-$config{'ue0'}=sprintf <<UE0;
-COMMENT=lokaal ethernet
-STATUS=up via usb-lan adapter
-TYPE=ethernet
-EXTRA_TYPE=eth2wifibridge
-STATUS=up
-IP=$master_ip/26
-DESC=lokaal ap
-SDESC=internap
-DHCP=10-250
-CHANNEL=2
-MODE=bridge ap wds
-ESSID=ap-WirelessLeiden-atrium
-NS_IP=172.17.141.2/26
-NS_MAC=00:15:6D:FC:4D:C0
-UE0
-
-$config{'vr0'}=sprintf <<VR0;
-COMMENT=link to SOM1
-TYPE=ethernet
-STATUS=up
-EXTRA_TYPE=eth2wifibridge
-IP=172.16.3.172/29
-DHCP=no
-DESC=ethernet
-SDESC=2SOM1
-MODE=managed
-ESSID=il-z.som1.wleiden.net
-CHANNEL=52
-DISTANCE=3 km
-NS_MAC=00:15:6D:F2:38:C8
-NS_IP=172.16.3.171/29
-VR0
-
-$config{'vr1'}=sprintf <<VR1;
-COMMENT=AP north east via Bullet2
-TYPE=ethernet
-STATUS=up
-EXTRA_TYPE=eth2wifibridge
-IP=172.17.25.1/24
-DHCP=10-250
-DESC=Ethernet to AP north
-SDESC=2AP-north
-VR1
-
-$config{'vr1:0'}=sprintf <<VR10;
-COMMENT=ethernet
-STATUS=up to mgmt interface
-TYPE=ethernet
-STATUS=up
-IP=172.16.3.225/30
-DESC=ethernet
-STATUS=up to mgmt interface
-SDESC=manageB2
-DHCP=no
-MODE=master
-ESSID=ap-WirelessLeiden-stadhuis-no
-CHANNEL=7
-DISTANCE=
-VR10
-
-$config{'vr2'}=sprintf <<VR2;
-COMMENT=a-link east via nanostation
-TYPE=ethernet
-STATUS=up
-EXTRA_TYPE=eth2wifibridge
-IP=172.16.3.209/29
-DHCP=no
-DESC=ethernet
-SDESC=2DeClercq
-MODE=bridge ap
-ESSID=il-o.stadhuis.wleiden.net
-CHANNEL=60
-NS_MAC=00:15:6D:BD:68:93
-NS_IP=172.16.3.210/29
-VR2
-
-$config{'vr3'}=sprintf <<VR3;
-COMMENT=a-link south-east via nanostation
-TYPE=ethernet
-STATUS=up
-EXTRA_TYPE=eth2wifibridge
-IP=172.16.5.113/29
-DHCP=no
-DESC=Ethernet to interlink south east (Plantsoen)
-SDESC=2Plantsoen
-MODE=bridge ap
-ESSID=il-zo.stadhuis.wleiden.net
-CHANNEL=44
-DISTANCE=0.5 km
-NS_MAC=00:15:6D:BD:8A:B3
-NS_IP=172.16.5.114/29
-VR3
-
-$config{'vr3:0'}=sprintf <<VR30;
-COMMENT=ethernet
-STATUS=up
-TYPE=ethernet
-STATUS=up
-IP=172.16.17.193/29
-DESC=interlink naar victoria
-SDESC=2victoria
-DHCP=no
-VR30
-
-$config{'sis0'}=sprintf <<SIS0;
-COMMENT=AP-zuid via Bullet2
-TYPE=ethernet
-STATUS=up
-EXTRA_TYPE=eth2wifibridge
-IP=172.17.29.1/24
-DHCP=10-250
-DESC=ethernet
-SDESC=2APzuid
-SIS0
-
-$config{'sis0:0'}=sprintf <<SIS00;
-COMMENT=to Bullet2 management interface
-TYPE=ethernet
-IP=172.16.3.241/30
-DESC=ethernet
-STATUS=up
-SDESC=manageB2
-DHCP=no
-MODE=master
-ESSID=ap-WirelessLeiden-stadhuis-z
-CHANNEL=4
-DISTANCE=
-SIS00
-
-$config{'sis1'}=sprintf <<SIS1;
-COMMENT=a-link west via Nanostation5
-TYPE=ethernet
-STATUS=up
-EXTRA_TYPE=eth2wifibridge
-IP=172.16.5.68/29
-DHCP=no
-DESC=Ethernet to interlink west (Vosko3)
-SDESC=2Vosko3
-NS_IP=172.16.5.67/29
-NS_MAC= 00:15:6D:BD:8A:B2
-MODE=ap station
-ESSID=il-o.vosko3.wleiden.net
-CHANNEL=108
-DISTANCE=0.5 km
-SIS1
-
-$config{'sis2'}=sprintf <<SIS2;
-COMMENT=AP west via Bullet2
-TYPE=ethernet
-STATUS=up
-EXTRA_TYPE=eth2wifibridge
-IP=172.17.30.1/24
-DHCP=10-250
-DESC=ethernet
-SDESC=2APwest
-SIS2
-
-$config{'sis2:0'}=sprintf <<SIS20;
-COMMENT=to management interface
-TYPE=ethernet
-IP=172.16.3.205/30
-DESC=ethernet
-SDESC=manageB2
-DHCP=no
-MODE=master
-ESSID=ap-w.stadhuis.wleiden.net
-CHANNEL=10
-DISTANCE=
-SIS20
-
-$config{'sis3'}=sprintf <<SIS3;
-COMMENT=a-link north-west via Nanostation5
-TYPE=ethernet
-STATUS=up
-EXTRA_TYPE=eth2wifibridge
-IP=172.16.3.177/29
-DHCP=no
-DESC=Ethernet to interlink north-west (Cope)
-SDESC=2cope
-MODE=bridge ap
-ESSID=il-nw.stadhuis.wleiden.net
-CHANNEL=116
-DISTANCE=1.8 km
-NS_IP=172.16.3.178/29
-NS_MAC=00:15:6D:BD:69:35
-SIS3
-
-$config{'sis3:0'}=sprintf <<SIS30;
-COMMENT=extra a-link to LucasN
-TYPE=ethernet
-STATUS=up
-EXTRA_TYPE=eth2wifibridge
-IP=172.16.4.129/29
-DHCP=no
-DESC=Ethernet to interlink north-west (LucasN)
-SDESC=2LucasN
-SIS30
-
-$config{'sis3:1'}=sprintf <<SIS31;
-COMMENT=extra a-link to DirkLos2
-TYPE=ethernet
-STATUS=up
-EXTRA_TYPE=eth2wifibridge
-IP=172.16.3.73/29
-DHCP=no
-DESC=Ethernet to interlink north-west (DirkLos2)
-SDESC=2DirkLos2
-SIS31