Index: /nodes/CNodePlantsoen2/wleiden.conf
===================================================================
--- /nodes/CNodePlantsoen2/wleiden.conf	(revision 7230)
+++ /nodes/CNodePlantsoen2/wleiden.conf	(revision 7237)
@@ -10,5 +10,5 @@
 $nodename='Plantsoen2';
 $status='planned';
-$release="5.0-RELEASE";
+$release="7.2-RELEASE";
 $node_config_version="1";
 $genesis_control="YES";
@@ -21,42 +21,76 @@
 $Y='463238';
 
-$LOKATIE='Kastje aan antennemast, PoE vanuit zolderkamer en dakraaam. Toegang via belendend perceel.';
 
-$config{'sis0'}=sprintf <<sis0;  # Ethernet
+$config{'ath0'}=sprintf <<ATH0;  # AP voor buurt
+TYPE=wireless
+IP=$master_ip/26
+DESC=AP voor de buurt
+SDESC=ap
+SPEED=11534336
+DHCP=10-60
+MODE=master
+ESSID=ap-omni.plantsoen2.wleiden.net
+CHANNEL=7
+POLAR=Vert
+ANTENNA=omni
+GAIN=8dBi
+DIRECTION=omni
+BEAMWIDTH=omni
+ATH0
+
+$config{'vr0'}=sprintf <<VR0;  # Lokaal ethernet met PoE
 TYPE=ethernet
 IP=172.17.169.65/28
 MEDIA=100baseT/UTP
-DESC=Ethernet naar CNodePlantsoen
+DESC=Ethernet naar woning Plantsoen
 SDESC=2plantsoen
 SPEED=10240000000
 DHCP=no
-sis0
+VR0
 
-$config{'ath0'}=sprintf <<ath0;  # Stadhuis4
-TYPE=wireless
-SUBTYPE=802.11a
-IP=172.16.1.106/30
-DESC=11A link naar Stadhuis4
-SDESC=2stadhuis4
-SPEED=11534336
+$config{'vr1'}=sprintf <<VR1; # a-link to Stadhuis via Nanostation5
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.3.106/30
+DHCP=no
+DESC=Ethernet to interlink north-north-west (Stadhuis)
+SDESC=2Stadhuis
+POINT_TO_POINT=172.16.3.105
+VR1
 
-POINT_TO_POINT=172.16.1.105
+$config{'vr1:0'}=sprintf <<VR10; # ethernet to nanostation mgmt interface
+TYPE=ethernet
+IP=172.16.3.189/30
+DESC=ethernet to nanostation mgmt interface
+SDESC=manageNS5
+DHCP=no
+#MODE=managed
+#ESSID=il-zo.stadhuis4.wleiden.net
+#CHANNEL=44
+#DISTANCE=0.5 km
+#POINT_TO_POINT=172.16.3.190
+VR10
 
+$config{'vr2'}=sprintf <<VR2; # a-link to Vosko via Nanostation25
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.3.170/30
+DHCP=no
+DESC=ethernet to interlink noord-2
+SDESC=2Vosko
+POINT_TO_POINT=172.16.3.169
+VR2
 
-MODE=managed
-ESSID=il-zo.stadhuis4.wleiden.net
-CHANNEL=36
-CARD_OPTION=mode 11a
-
-POLAR=Hor
-ANTENNA=pa4040/5
-GAIN=15dBi
-DIRECTION=270
-BEAMWIDTH=40
-CABLE=2
-HEIGTH=12
+$config{'vr2:0'}=sprintf <<VR20; # to Nanostation2 management interface
+TYPE=ethernet
+IP=172.16.3.193/30
+DESC=ethernet to Nanostation2 management interface
+SDESC=manageNS2
+SPEED=10240000000
 DHCP=no
-
-ath0
-
-
+#MODE=managed
+#ESSID=il-zo.vosko3.wleiden.net
+#CHANNEL=
+#DISTANCE=0.7 km
+#POINT_TO_POINT=172.16.3.194
+VR20