Index: nodes/CNodeStadhuis/wleiden.conf
===================================================================
--- nodes/CNodeStadhuis/wleiden.conf	(revision 8196)
+++ nodes/CNodeStadhuis/wleiden.conf	(revision 8261)
@@ -14,5 +14,6 @@
 
 # configuratie van ethernetpoort via usb-ethernet adapter
-$config{'ue0'}=sprintf <<UE0;  # lokaal ethernet via usb-lan adapter
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=lokaal ethernet via usb-lan adapter
 TYPE=ethernet
 IP=$master_ip/26
@@ -22,5 +23,6 @@
 UE0
 
-$config{'ue0:0'}=sprintf <<UE00; # management interface via usb-lan adapter
+$config{'ue0:0'}=sprintf <<UE00;
+COMMENT=management interface via usb-lan adapter
 TYPE=ethernet
 IP=172.16.3.245/30
@@ -30,5 +32,6 @@
 UE00
 
-$config{'vr0'}=sprintf <<VR0; # link to SOM1
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=link to SOM1
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -37,12 +40,13 @@
 DESC=ethernet to interlink noord
 SDESC=2SOM1
-#MODE=managed
-#ESSID=il-z.som1.wleiden.net
-#CHANNEL=52
-#DISTANCE=3 km
-#NSMAC=
+MODE=managed
+ESSID=il-z.som1.wleiden.net
+CHANNEL=52
+DISTANCE=3 km
+NSMAC=
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # AP north east via Bullet2
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=AP north east via Bullet2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -53,5 +57,6 @@
 VR1
 
-$config{'vr1:0'}=sprintf <<VR10; # ethernet to mgmt interface
+$config{'vr1:0'}=sprintf <<VR10;
+COMMENT=ethernet to mgmt interface
 TYPE=ethernet
 IP=172.16.3.225/30
@@ -59,11 +64,12 @@
 SDESC=manageB2
 DHCP=no
-#MODE=master
-#ESSID=ap-WirelessLeiden-stadhuis-no
-#CHANNEL=7
-#DISTANCE=
+MODE=master
+ESSID=ap-WirelessLeiden-stadhuis-no
+CHANNEL=7
+DISTANCE=
 VR10
 
-$config{'vr2'}=sprintf <<VR2; # a-link east via nanostation
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=a-link east via nanostation
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -74,5 +80,6 @@
 VR2
 
-$config{'vr2:0'}=sprintf <<VR20; # to nanostation east management interface
+$config{'vr2:0'}=sprintf <<VR20;
+COMMENT=to nanostation east management interface
 TYPE=ethernet
 IP=172.16.3.233/30
@@ -80,11 +87,12 @@
 SDESC=manageNS5
 DHCP=no
-#MODE=master
-#ESSID=il-o.stadhuis.wleiden.net
-#CHANNEL=36
-#DISTANCE=
+MODE=master
+ESSID=il-o.stadhuis.wleiden.net
+CHANNEL=36
+DISTANCE=
 VR20
 
-$config{'vr3'}=sprintf <<VR3; # a-link south-east via nanostation
+$config{'vr3'}=sprintf <<VR3;
+COMMENT=a-link south-east via nanostation
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -95,5 +103,6 @@
 VR3
 
-$config{'vr3:0'}=sprintf <<VR30; # ethernet to nanostation mgmt interface
+$config{'vr3:0'}=sprintf <<VR30;
+COMMENT=ethernet to nanostation mgmt interface
 TYPE=ethernet
 IP=172.16.3.237/30
@@ -101,11 +110,12 @@
 SDESC=manageNS5
 DHCP=no
-#MODE=master
-#ESSID=il-zo.stadhuis.wleiden.net
-#CHANNEL=44
-#DISTANCE=0.5 km
+MODE=master
+ESSID=il-zo.stadhuis.wleiden.net
+CHANNEL=44
+DISTANCE=0.5 km
 VR30
 
-$config{'sis0'}=sprintf <<SIS0; # AP-zuid via Bullet2
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=AP-zuid via Bullet2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -116,5 +126,6 @@
 SIS0
 
-$config{'sis0:0'}=sprintf <<SIS00; # to Bullet2 management interface
+$config{'sis0:0'}=sprintf <<SIS00;
+COMMENT=to Bullet2 management interface
 TYPE=ethernet
 IP=172.16.3.241/30
@@ -122,11 +133,12 @@
 SDESC=manageB2
 DHCP=no
-#MODE=master
-#ESSID=ap-WirelessLeiden-stadhuis-z
-#CHANNEL=4
-#DISTANCE=
+MODE=master
+ESSID=ap-WirelessLeiden-stadhuis-z
+CHANNEL=4
+DISTANCE=
 SIS00
 
-$config{'sis1'}=sprintf <<SIS1; # a-link west via Nanostation5
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=a-link west via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -137,5 +149,6 @@
 SIS1
 
-$config{'sis1:0'}=sprintf <<SIS10; # to nanostation mgmt interface
+$config{'sis1:0'}=sprintf <<SIS10;
+COMMENT=to nanostation mgmt interface
 TYPE=ethernet
 IP=172.16.3.201/30
@@ -143,11 +156,12 @@
 SDESC=manageNS5
 DHCP=no
-#MODE=managed
-#ESSID=il-o.vosko3.wleiden.net
-#CHANNEL=108
-#DISTANCE=0.5 km
+MODE=managed
+ESSID=il-o.vosko3.wleiden.net
+CHANNEL=108
+DISTANCE=0.5 km
 SIS10
 
-$config{'sis2'}=sprintf <<SIS2; # AP west via Bullet2
+$config{'sis2'}=sprintf <<SIS2;
+COMMENT=AP west via Bullet2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -158,5 +172,6 @@
 SIS2
 
-$config{'sis2:0'}=sprintf <<SIS20; # to management interface
+$config{'sis2:0'}=sprintf <<SIS20;
+COMMENT=to management interface
 TYPE=ethernet
 IP=172.16.3.205/30
@@ -164,11 +179,12 @@
 SDESC=manageB2
 DHCP=no
-#MODE=master
-#ESSID=ap-w.stadhuis.wleiden.net
-#CHANNEL=10
-#DISTANCE=
+MODE=master
+ESSID=ap-w.stadhuis.wleiden.net
+CHANNEL=10
+DISTANCE=
 SIS20
 
-$config{'sis2:1'}=sprintf <<SIS21; # to Huub
+$config{'sis2:1'}=sprintf <<SIS21;
+COMMENT=to Huub
 TYPE=ethernet
 IP=172.16.3.209/30
@@ -177,5 +193,6 @@
 SIS21
 
-$config{'sis3'}=sprintf <<SIS3; # a-link north-west via Nanostation5
+$config{'sis3'}=sprintf <<SIS3;
+COMMENT=a-link north-west via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -186,5 +203,6 @@
 SIS3
 
-$config{'sis3:0'}=sprintf <<SIS30; # ethernet to nanostation mgmt interface
+$config{'sis3:0'}=sprintf <<SIS30;
+COMMENT=ethernet to nanostation mgmt interface
 TYPE=ethernet
 IP=172.16.3.217/30
@@ -192,11 +210,12 @@
 SDESC=manageNS5
 DHCP=no
-#MODE=master
-#ESSID=il-nw.stadhuis.wleiden.net
-#CHANNEL=116
-#DISTANCE=1.8 km
+MODE=master
+ESSID=il-nw.stadhuis.wleiden.net
+CHANNEL=116
+DISTANCE=1.8 km
 SIS30
 
-$config{'sis3:1'}=sprintf <<SIS31; # extra a-link to DirkLos2
+$config{'sis3:1'}=sprintf <<SIS31;
+COMMENT=extra a-link to DirkLos2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -207,5 +226,6 @@
 SIS31
 
-$config{'sis3:2'}=sprintf <<SIS32; # extra a-link to LvLn2
+$config{'sis3:2'}=sprintf <<SIS32;
+COMMENT=extra a-link to LvLn2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge