Index: nodes/CNodeStadhuis/wleiden.conf
===================================================================
--- nodes/CNodeStadhuis/wleiden.conf	(revision 7241)
+++ nodes/CNodeStadhuis/wleiden.conf	(revision 7241)
@@ -0,0 +1,247 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeStadhuis
+# this node replaces CNodeStadhuis1,2,3,4
+#
+$location="Stadhuis, Stadhuisplein 1, 2311 EJ, Leiden";
+$master_ip='172.17.191.1';
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Stadhuis';
+$release="7.2-RELEASE";
+$node_config_version="1";
+$genesis_control="YES";
+$OS='FreeBSD';
+$labelpos='right';
+# edugis x,y 93664,463699
+$X='93664';
+$Y='463699';
+$status='up';
+
+$config{'aue0'}=sprintf <<UE0; lokaal ethernet via usb-lan adapter
+TYPE=ethernet
+IP=
+DESC=lokaal ethernet
+SDESC=
+SPEED=10240000000
+DHCP=no
+UE0
+
+$config{'aue0:0'}=sprintf <<UE00; management interface via usb-lan adapter
+TYPE=ethernet
+IP=172.16.3.209/28
+DESC=lokaal ethernet
+SDESC=
+SPEED=10240000000
+DHCP=no
+UE00
+
+$config{'vr0'}=sprintf <<VR0; # b-link to SOM via Bullet2
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.0.174/30
+DHCP=no
+DESC=ethernet to interlink noord
+SDESC=2SOM
+POINT_TO_POINT=172.16.0.173
+VR0
+
+$config{'vr0:0'}=sprintf <<VR00; # to Bullet2 management interface
+TYPE=ethernet
+IP=172.16.3.221/30
+DESC=ethernet to Bullet management interface
+SDESC=manageB2
+SPEED=10240000000
+DHCP=no
+#MODE=managed
+#ESSID=il-z.som.wleiden.net
+#CHANNEL=11
+#DISTANCE=3 km
+#POINT_TO_POINT=172.16.3.222
+VR00
+
+$config{'vr1'}=sprintf <<VR1; # AP north east via Bullet2
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.4.65/26
+DHCP=70-120
+DESC=Ethernet to AP north
+SDESC=2AP-north
+POINT_TO_POINT=
+VR1
+
+$config{'vr1:0'}=sprintf <<VR10; # ethernet to mgmt interface
+TYPE=ethernet
+IP=172.16.3.225/30
+DESC=ethernet to mgmt interface
+SDESC=manageB2
+DHCP=no
+#MODE=master
+#ESSID=ap-no.stadhuis.wleiden.net
+#CHANNEL=7
+#DISTANCE=
+#POINT_TO_POINT=172.16.3.226
+VR10
+
+$config{'vr2'}=sprintf <<VR2; # a-link east via nanostation
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.3.229/30
+DHCP=no
+DESC=ethernet to interlink east
+SDESC=2CeTIM
+POINT_TO_POINT=172.16.3.230
+VR2
+
+$config{'vr2:0'}=sprintf <<VR20; # to nanostation east management interface
+TYPE=ethernet
+IP=172.16.3.233/30
+DESC=ethernet to management interface
+SDESC=manageNS5
+SPEED=10240000000
+DHCP=no
+#MODE=master
+#ESSID=il-o.stadhuis.wleiden.net
+#CHANNEL=
+#DISTANCE=
+#POINT_TO_POINT=172.16.3.234
+VR20
+
+$config{'vr3'}=sprintf <<VR3; # a-link south-east via nanostation
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.3.105/30
+DHCP=no
+DESC=Ethernet to interlink south east (Plantsoen)
+SDESC=2Plantsoen
+POINT_TO_POINT=172.16.3.106
+VR3
+
+$config{'vr3:0'}=sprintf <<VR30; # ethernet to nanostation mgmt interface
+TYPE=ethernet
+IP=172.16.3.237/30
+DESC=ethernet to nanostation mgmt interface
+SDESC=manageNS5
+DHCP=no
+#MODE=master
+#ESSID=il-zo.stadhuis4.wleiden.net
+#CHANNEL=44
+#DISTANCE=0.5 km
+#POINT_TO_POINT=172.16.3.238
+VR30
+
+$config{'sis0'}=sprintf <<SIS0; # AP-zuid via Bullet2
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=$master_ip/26
+DHCP=10-60
+DESC=ethernet to ap z
+SDESC=2APzuid
+SIS0
+
+$config{'sis0:0'}=sprintf <<SIS00; # to Bullet2 management interface
+TYPE=ethernet
+IP=172.16.3.241/30
+DESC=ethernet to management interface
+SDESC=manageB2
+SPEED=10240000000
+DHCP=no
+#MODE=master
+#ESSID=ap-z.stadhuis.wleiden.net
+#CHANNEL=4
+#DISTANCE=
+#POINT_TO_POINT=172.16.3.242
+SIS00
+
+$config{'sis1'}=sprintf <<SIS1; # a-link west via Nanostation5
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.3.166/30
+DHCP=no
+DESC=Ethernet to interlink west (Vosko3)
+SDESC=2Vosko3
+POINT_TO_POINT=172.16.3.165
+SIS1
+
+$config{'sis1:0'}=sprintf <<SIS10; # to nanostation mgmt interface
+TYPE=ethernet
+IP=172.16.3.201/30
+DESC=ethernet to nanostation mgmt interface
+SDESC=manageNS5
+DHCP=no
+#MODE=managed
+#ESSID=il-o.vosko3.wleiden.net
+#CHANNEL=100
+#DISTANCE=0.5 km
+#POINT_TO_POINT=172.16.3.202/30
+SIS10
+
+$config{'sis2'}=sprintf <<SIS2; # AP west via Bullet2
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.4.1/26
+DHCP=10-60
+DESC=ethernet to ap west
+SDESC=2APwest
+SIS2
+
+$config{'sis2:0'}=sprintf <<SIS20; # to management interface
+TYPE=ethernet
+IP=172.16.3.205/30
+DESC=ethernet to management interface
+SDESC=manageB2
+SPEED=10240000000
+DHCP=10-60
+#MODE=master
+#ESSID=ap-w.stadhuis.wleiden.net
+#CHANNEL=10
+#DISTANCE=
+#POINT_TO_POINT=172.16.3.206/30
+SIS20
+
+
+$config{'sis3'}=sprintf <<SIS3; # a-link north-west via Nanostation5
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.3.213/30
+DHCP=no
+DESC=Ethernet to interlink north-west (Cope)
+SDESC=2Stadhuis
+POINT_TO_POINT=172.16.3.214
+SIS3
+
+$config{'sis3:0'}=sprintf <<SIS30; # ethernet to nanostation mgmt interface
+TYPE=ethernet
+IP=172.16.3.217/30
+DESC=ethernet to nanostation mgmt interface
+SDESC=manageNS5
+DHCP=no
+#MODE=master
+#ESSID=il-nw.stadhuis.wleiden.net
+#CHANNEL=
+#DISTANCE=0.5 km
+#POINT_TO_POINT=172.16.3.218
+SIS30
+
+$config{'sis3:1'}=sprintf <<SIS31; # extra a-link to DirkLos2
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.3.45/30
+DHCP=no
+DESC=Ethernet to interlink north-west (DirkLos2)
+SDESC=2DirkLos2
+POINT_TO_POINT=172.16.3.46
+SIS31
+
+$config{'sis3:2'}=sprintf <<SIS32; # extra a-link to LvLn22
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.3.45/30
+DHCP=no
+DESC=Ethernet to interlink north-west (LvLn2)
+SDESC=2LvLn2
+POINT_TO_POINT=172.16.3.46
+SIS32