Index: nodes/CNodeAA24/wleiden.conf
===================================================================
--- nodes/CNodeAA24/wleiden.conf	(revision 8260)
+++ nodes/CNodeAA24/wleiden.conf	(revision 8261)
@@ -20,5 +20,6 @@
 #$AGGREGATE=22;
 
-$config{'ep0'}=sprintf <<ED0;  # eth
+$config{'ep0'}=sprintf <<ED0;
+COMMENT=eth
 TYPE=ethernet
 IP=172.25.136.65/29
@@ -35,5 +36,6 @@
 
 
-$config{'wi0'}=sprintf <<EW0;  # OMNI
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=OMNI
 TYPE=wireless
 IP=$master_ip/26
@@ -53,5 +55,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;  # link naar Hans
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=link naar Hans
 TYPE=wireless
 IP=172.16.2.42/30
@@ -65,5 +68,5 @@
 MODE=managed
 ESSID=il-w.hans.wleiden.net
-#CHANNEL=4
+CHANNEL=4
 
 
@@ -72,5 +75,6 @@
 EW1
 
-$config{'wi2'}=sprintf <<EW2;  # link naar roomburgh2
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=link naar roomburgh2
 TYPE=wireless
 IP=172.16.0.246/30
@@ -82,5 +86,5 @@
 MODE=managed
 ESSID=il-zo.roomburgh2.wleiden.net
-#CHANNEL=5
+CHANNEL=5
 
 
Index: nodes/CNodeAJSoft1/wleiden.conf
===================================================================
--- nodes/CNodeAJSoft1/wleiden.conf	(revision 8260)
+++ nodes/CNodeAJSoft1/wleiden.conf	(revision 8261)
@@ -10,5 +10,6 @@
 $Y='462384';
 
-$config{'ath0'}=sprintf <<ATH0;  # ap
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap
 TYPE=wireless
 IP=$master_ip/26
@@ -21,5 +22,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # Ethernet naar AJSoft2
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Ethernet naar AJSoft2
 TYPE=ethernet
 IP=172.16.3.81/30
@@ -29,5 +31,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # link naar Haagwijk 
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=link naar Haagwijk 
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -36,12 +39,13 @@
 SDESC=2haagwijk
 DHCP=no
-#MODE=managed
-#ESSID=il-nw.haagwijk.wleiden.net
-#CHANNEL=52
-#NSMAC=00:15:6D:EA:EB:D5
-#NS_IP=192.168.1.21
+MODE=managed
+ESSID=il-nw.haagwijk.wleiden.net
+CHANNEL=52
+NSMAC=00:15:6D:EA:EB:D5
+NS_IP=192.168.1.21
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # Link naar Robijn
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=Link naar Robijn
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -50,12 +54,13 @@
 SDESC=2robijn
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-nnw.ajsoft1.wleiden.net
-#CHANNEL=60
-#NSMAC=00:15:6D:EC:82:8A
-#NS_IP=192.168.1.20
+MODE=bridge ap
+ESSID=il-nnw.ajsoft1.wleiden.net
+CHANNEL=60
+NSMAC=00:15:6D:EC:82:8A
+NS_IP=192.168.1.20
 VR2
 
-$config{'ue0'}=sprintf <<UE0; # Link naar RijnVliet
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=Link naar RijnVliet
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -64,8 +69,8 @@
 SDESC=b2rijnvliet
 DHCP=no
-#MODE=bridge managed
-#ESSID=il-zw.rv.wleiden.net
-#CHANNEL=4
-#BulletMAC=00:15:6D:E8:F9:B1
-#BulletIP=192.168.1.21
+MODE=bridge managed
+ESSID=il-zw.rv.wleiden.net
+CHANNEL=4
+BulletMAC=00:15:6D:E8:F9:B1
+BulletIP=192.168.1.21
 UE0
Index: nodes/CNodeAJSoft2/wleiden.conf
===================================================================
--- nodes/CNodeAJSoft2/wleiden.conf	(revision 8260)
+++ nodes/CNodeAJSoft2/wleiden.conf	(revision 8261)
@@ -9,5 +9,6 @@
 $Y='462384';
 
-$config{'ath0'}=sprintf <<ATH0;  # link livinglab
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=link livinglab
 TYPE=wireless
 IP=172.16.2.242/30
@@ -15,10 +16,11 @@
 SDESC=2livinglab
 DHCP=no
-#MODE=bridge managed
-#ESSID=il-n.livinglab.wleiden.net
-#CHANNEL=36
+MODE=bridge managed
+ESSID=il-n.livinglab.wleiden.net
+CHANNEL=36
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # Ethernet naar AJSoft1
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Ethernet naar AJSoft1
 TYPE=ethernet
 IP=172.16.3.82/30
@@ -28,5 +30,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # link naar Hofland 
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=link naar Hofland 
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -35,12 +38,13 @@
 SDESC=2hofland
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-w.ajsoft2.wleiden.net
-#CHANNEL=100
-#NSMAC=00:15:6D:EA:F0:6A
-#NS_IP=192.168.1.20
+MODE=bridge ap
+ESSID=il-w.ajsoft2.wleiden.net
+CHANNEL=100
+NSMAC=00:15:6D:EA:F0:6A
+NS_IP=192.168.1.20
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # Link naar oost
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=Link naar oost
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -49,12 +53,13 @@
 SDESC=a2rijnvliet
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-o-ajsoft2.wleiden.net
-#CHANNEL=52
-#NSMAC=00:15:6D:EA:F0:6D
-#NS_IP=192.168.1.20
+MODE=bridge ap
+ESSID=il-o-ajsoft2.wleiden.net
+CHANNEL=52
+NSMAC=00:15:6D:EA:F0:6D
+NS_IP=192.168.1.20
 VR2
 
-$config{'ue0'}=sprintf <<UE0;  # Link naar Muiderkring
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=Link naar Muiderkring
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -63,8 +68,8 @@
 SDESC=2muiderkring
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-nno.ajsoft2.wleiden.net
-#CHANNEL=8
-#BulletMAC=00:15:6D:E8:F9:C6
-#BulletIP=192.168.1.20
+MODE=bridge ap
+ESSID=il-nno.ajsoft2.wleiden.net
+CHANNEL=8
+BulletMAC=00:15:6D:E8:F9:C6
+BulletIP=192.168.1.20
 UE0
Index: nodes/CNodeAMWaterT1/wleiden.conf
===================================================================
--- nodes/CNodeAMWaterT1/wleiden.conf	(revision 8260)
+++ nodes/CNodeAMWaterT1/wleiden.conf	(revision 8261)
@@ -17,5 +17,6 @@
 $AGGREGATE=22;
 
-$config{'sis0'}=sprintf <<ED0;  # ethernet poort 0 Soekris  (naar het internet)
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=ethernet poort 0 Soekris  (naar het internet)
 TYPE=ethernet
 IP=172.25.90.65/29
@@ -25,5 +26,6 @@
 ED0
 
-$config{'sis1'}=sprintf <<ED1;  # ethernet poort 1  op Soekris
+$config{'sis1'}=sprintf <<ED1;
+COMMENT=ethernet poort 1  op Soekris
 TYPE=ethernet
 IP=172.16.2.121/30
@@ -33,5 +35,6 @@
 ED1
 
-$config{'ath0'}=sprintf <<EW0;  # OMNI voor Wifi op de westeinder
+$config{'ath0'}=sprintf <<EW0;
+COMMENT=OMNI voor Wifi op de westeinder
 TYPE=wireless
 IP=$master_ip/26
@@ -45,5 +48,6 @@
 EW0
 
-$config{'wi0'}=sprintf <<EW1;  # Link naar LMkepers Leimuiden
+$config{'wi0'}=sprintf <<EW1;
+COMMENT=Link naar LMkepers Leimuiden
 TYPE=wireless
 IP=172.16.1.210/30
@@ -57,5 +61,6 @@
 EW1
 
-$config{'wi1'}=sprintf <<EW2;  # link Node drijfhuis
+$config{'wi1'}=sprintf <<EW2;
+COMMENT=link Node drijfhuis
 TYPE=wireless
 IP=172.16.2.125/30
@@ -68,5 +73,6 @@
 EW2
 
-$config{'wi1:0'}=sprintf <<EW20; #link naar Node Recpark
+$config{'wi1:0'}=sprintf <<EW20;
+COMMENT=link naar Node Recpark
 TYPE=wireless
 IP=172.16.2.129/30
Index: nodes/CNodeAMWaterT2/wleiden.conf
===================================================================
--- nodes/CNodeAMWaterT2/wleiden.conf	(revision 8260)
+++ nodes/CNodeAMWaterT2/wleiden.conf	(revision 8261)
@@ -17,5 +17,6 @@
 $AGGREGATE=22;
 
-$config{'sis0'}=sprintf <<ED0;  # ethernet poort 0 Soekris
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=ethernet poort 0 Soekris
 TYPE=ethernet
 IP=172.25.94.65/29
@@ -29,5 +30,6 @@
 ED0
 
-$config{'sis1'}=sprintf <<ED1;  # ethernet poort 1 naar node watertoren 1 
+$config{'sis1'}=sprintf <<ED1;
+COMMENT=ethernet poort 1 naar node watertoren 1 
 TYPE=ethernet
 IP=172.16.2.122/30
@@ -42,5 +44,6 @@
 ED1
 
-$config{'wi0'}=sprintf <<EW0;  # OMNI voor Watertoren
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=OMNI voor Watertoren
 TYPE=wireless
 IP=$master_ip/26
@@ -59,5 +62,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;  # link naar onbekend
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=link naar onbekend
 TYPE=wireless
 IP=172.16.16.59/30
Index: nodes/CNodeAMdrijfhuis/wleiden.conf
===================================================================
--- nodes/CNodeAMdrijfhuis/wleiden.conf	(revision 8260)
+++ nodes/CNodeAMdrijfhuis/wleiden.conf	(revision 8261)
@@ -17,5 +17,6 @@
 $AGGREGATE=22;
 
-$config{'sis0'}=sprintf <<ED0;  # ethernet poort 0 Soekris
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=ethernet poort 0 Soekris
 TYPE=ethernet
 IP=172.25.99.65/29
@@ -29,5 +30,6 @@
 ED0
 
-$config{'ath0'}=sprintf <<EW0;  # OMNI voor Wifi rondom drijfhuis in Aalsmeer
+$config{'ath0'}=sprintf <<EW0;
+COMMENT=OMNI voor Wifi rondom drijfhuis in Aalsmeer
 TYPE=wireless
 IP=$master_ip/26
@@ -42,5 +44,6 @@
 EW0
 
-$config{'wi0'}=sprintf <<EW0;  # Link naar Watertoren Aalsmeer
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=Link naar Watertoren Aalsmeer
 TYPE=wireless
 IP=172.16.2.126/30
Index: nodes/CNodeAMrecpark/wleiden.conf
===================================================================
--- nodes/CNodeAMrecpark/wleiden.conf	(revision 8260)
+++ nodes/CNodeAMrecpark/wleiden.conf	(revision 8261)
@@ -17,5 +17,6 @@
 $AGGREGATE=22;
 
-$config{'sis0'}=sprintf <<ED0;  # ethernet poort 0 Soekris
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=ethernet poort 0 Soekris
 TYPE=ethernet
 IP=172.25.98.65/29
@@ -29,5 +30,6 @@
 ED0
 
-$config{'ath0'}=sprintf <<EW0;  # OMNI voor Wifi rondom Recreatiepark Aalsmeer
+$config{'ath0'}=sprintf <<EW0;
+COMMENT=OMNI voor Wifi rondom Recreatiepark Aalsmeer
 TYPE=wireless
 IP=$master_ip/26
@@ -46,5 +48,6 @@
 EW0
 
-$config{'wi0'}=sprintf <<EW1;  # Link naar Watertoren Aalsmeer
+$config{'wi0'}=sprintf <<EW1;
+COMMENT=Link naar Watertoren Aalsmeer
 TYPE=wireless
 IP=172.16.2.130/30
Index: nodes/CNodeAZC/wleiden.conf
===================================================================
--- nodes/CNodeAZC/wleiden.conf	(revision 8260)
+++ nodes/CNodeAZC/wleiden.conf	(revision 8261)
@@ -19,5 +19,6 @@
 $Y='465207';
 
-$config{'ep0'}=sprintf <<ED0;  # Ethernet
+$config{'ep0'}=sprintf <<ED0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.19.144.65/26
@@ -31,5 +32,6 @@
 ED0
 
-$config{'wi0'}=sprintf <<EW0;  #link naar Lijtweg2
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=link naar Lijtweg2
 TYPE=wireless
 IP=172.16.1.97/30
@@ -48,5 +50,6 @@
 EW0
 
-$config{'wi0:0'}=sprintf <<EW00;  #link naar Endegeest
+$config{'wi0:0'}=sprintf <<EW00;
+COMMENT=link naar Endegeest
 TYPE=wireless
 IP=172.19.144.129/28
@@ -57,5 +60,6 @@
 
 
-$config{'wi1'}=sprintf <<EW1;    #link naar WP
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=link naar WP
 TYPE=wireless
 #11=Wandy WP depedance
@@ -76,5 +80,6 @@
 EW1
 
-$config{'wi1:0'}=sprintf <<EW10;  # Link naar Wissel
+$config{'wi1:0'}=sprintf <<EW10;
+COMMENT=Link naar Wissel
 TYPE=wireless
 IP=172.16.2.53/30
@@ -85,5 +90,6 @@
 
 
-$config{'wi1:1'}=sprintf <<EW11;  # Link naar Eddy
+$config{'wi1:1'}=sprintf <<EW11;
+COMMENT=Link naar Eddy
 TYPE=wireless
 IP=172.16.2.113/30
@@ -94,5 +100,6 @@
 
 
-$config{'wi2'}=sprintf <<EW2;  # link naar Rabo
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=link naar Rabo
 TYPE=wireless
 IP=172.16.0.222/30
@@ -111,5 +118,6 @@
 EW2
 
-$config{'wi3'}=sprintf <<EW3;  # Link naar Unigor
+$config{'wi3'}=sprintf <<EW3;
+COMMENT=Link naar Unigor
 TYPE=wireless
 IP=172.16.0.166/30
Index: nodes/CNodeAster/wleiden.conf
===================================================================
--- nodes/CNodeAster/wleiden.conf	(revision 8260)
+++ nodes/CNodeAster/wleiden.conf	(revision 8261)
@@ -14,5 +14,6 @@
 $Y='466945';
 
-$config{'ath0'}=sprintf <<ED1;  # omni voor de buurt
+$config{'ath0'}=sprintf <<ED1;
+COMMENT=omni voor de buurt
 TYPE=wireless
 IP=$master_ip/26
@@ -26,5 +27,6 @@
 ED1
 
-$config{'vr0'}=sprintf <<VR0;  # local subnet with PoE
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=local subnet with PoE
 TYPE=ethernet
 IP=172.23.26.65/28 
@@ -34,5 +36,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # link naar lijtweg1 bridge
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=link naar lijtweg1 bridge
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -41,5 +44,5 @@
 SDESC=aster2lijtweg1
 DHCP=no
-#ESSID=il-w.lijtweg1.wleiden.net
+ESSID=il-w.lijtweg1.wleiden.net
 VR1
 
Index: nodes/CNodeBCSte/wleiden.conf
===================================================================
--- nodes/CNodeBCSte/wleiden.conf	(revision 8260)
+++ nodes/CNodeBCSte/wleiden.conf	(revision 8261)
@@ -11,5 +11,6 @@
 $Y='462885';
 
-$config{'ath0'}=sprintf <<ATH0;   # Omni
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=Omni
 TYPE=wireless
 IP=$master_ip/26
@@ -22,5 +23,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # Ethernet naar BCSte
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Ethernet naar BCSte
 TYPE=ethernet
 IP=172.24.0.65/26
@@ -30,5 +32,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # b-link naar Zwaluw
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=b-link naar Zwaluw
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -37,12 +40,13 @@
 SDESC=2zwaluwak
 DHCP=no
-#MODE=bridge-ap
-#ESSID=il-nw.bcste.wleiden.net
-#CHANNEL=1
-#BulletMAC=
-#BulletIP=172.16.3.250/29
+MODE=bridge-ap
+ESSID=il-nw.bcste.wleiden.net
+CHANNEL=1
+BulletMAC=
+BulletIP=172.16.3.250/29
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # link Vosko2
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=link Vosko2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -51,9 +55,9 @@
 DESC=interlink o (Vosko2)
 SDESC=2vosko2
-#MODE=bridge=station
-#ESSID=il-w.vosko2.wleiden.net
-#CHANNEL=140
-#NSIP=172.16.3.154/29
-#NSMAC=00:15:6D:
+MODE=bridge=station
+ESSID=il-w.vosko2.wleiden.net
+CHANNEL=140
+NSIP=172.16.3.154/29
+NSMAC=00:15:6D:
 VR2
 
Index: nodes/CNodeBDboon/wleiden.conf
===================================================================
--- nodes/CNodeBDboon/wleiden.conf	(revision 8260)
+++ nodes/CNodeBDboon/wleiden.conf	(revision 8261)
@@ -17,5 +17,6 @@
 $LOCATION='v.d. Boon, Bilderdam';
 
-$config{'sis0'}=sprintf <<ED0;  # eth
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=eth
 TYPE=ethernet
 IP=172.25.41.65/29
@@ -24,9 +25,10 @@
 SDESC=eth
 DHCP=68-70
-#DHCP=no
+DHCP=no
 
 ED0
 
-$config{'wi0'}=sprintf <<EW0;  # OMNI
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=OMNI
 TYPE=wireless
 IP=$master_ip/26
@@ -44,5 +46,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;  # link naar kempers
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=link naar kempers
 TYPE=wireless
 IP=172.16.1.214/30
@@ -59,5 +62,6 @@
 EW1
 
-$config{'wi2'}=sprintf <<EW2;  # link naar RWGemhuis
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=link naar RWGemhuis
 TYPE=wireless
 IP=172.16.3.8/30
Index: nodes/CNodeBroekplein/wleiden.conf
===================================================================
--- nodes/CNodeBroekplein/wleiden.conf	(revision 8260)
+++ nodes/CNodeBroekplein/wleiden.conf	(revision 8261)
@@ -11,5 +11,6 @@
 $Y='466097';
 
-$config{'ath0'}=sprintf <<ATH0; # AP omni
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=AP omni
 TYPE=wireless
 IP=$master_ip/26
@@ -23,5 +24,6 @@
 
 
-$config{'ue0'}=sprintf <<UE0;  # Ethernet
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.21.144.65/28
@@ -31,5 +33,6 @@
 UE0
 
-$config{'vr0'}=sprintf <<VR0; # a-link naar SOM via Nanostation5
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=a-link naar SOM via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -38,11 +41,12 @@
 DESC=Link naar SOM
 SDESC=2som
-#MODE=managed
-#ESSID=il-n.som1.wleiden.net
-#CHANNEL=132
-#NSMAC=
+MODE=managed
+ESSID=il-n.som1.wleiden.net
+CHANNEL=132
+NSMAC=
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # link naar Rosmolen
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=link naar Rosmolen
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -51,11 +55,12 @@
 IP=172.16.0.210/30
 DHCP=no
-#MODE=ap
-#ESSID=il-z.broekplein.wleiden.net
-#CHANNEL=36
-#NSMAC=
+MODE=ap
+ESSID=il-z.broekplein.wleiden.net
+CHANNEL=36
+NSMAC=
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # link naar Lijtweg
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=link naar Lijtweg
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -64,7 +69,7 @@
 DESC=Link naar Lijtweg 
 SDESC=2lijtweg1
-#MODE=ap
-#ESSID=il-w.broekplein.wleiden.net
-#CHANNEL=44
-#NSMAC=
+MODE=ap
+ESSID=il-w.broekplein.wleiden.net
+CHANNEL=44
+NSMAC=
 VR2
Index: nodes/CNodeBrug/wleiden.conf
===================================================================
--- nodes/CNodeBrug/wleiden.conf	(revision 8260)
+++ nodes/CNodeBrug/wleiden.conf	(revision 8261)
@@ -17,5 +17,6 @@
 $status='up';
 
-$config{'sis0'}=sprintf <<SIS0;  # eth
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=eth
 TYPE=ethernet
 IP=172.19.160.65/29
@@ -31,5 +32,6 @@
 
 
-$config{'wi0'}=sprintf <<EW0;  # Locale Omni
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=Locale Omni
 TYPE=wireless
 IP=$master_ip/26
@@ -49,5 +51,6 @@
 
 
-$config{'wi1'}=sprintf <<EW1;  # Link naar Unigor
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=Link naar Unigor
 TYPE=wireless
 IP=172.16.0.18/30
@@ -64,5 +67,6 @@
 EW1
 
-$config{'wi2'}=sprintf <<EW2;  # Link naar Lijtweg2
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=Link naar Lijtweg2
 TYPE=wireless
 IP=172.16.1.178/30
Index: nodes/CNodeCam/wleiden.conf
===================================================================
--- nodes/CNodeCam/wleiden.conf	(revision 8260)
+++ nodes/CNodeCam/wleiden.conf	(revision 8261)
@@ -12,5 +12,6 @@
 $status='up';
 
-$config{'ath0'}=sprintf <<ATH0;  # Lokale Omni
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=Lokale Omni
 TYPE=wireless
 IP=$master_ip/26
@@ -23,5 +24,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # eth
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=eth
 TYPE=ethernet
 IP=172.19.174.65/29
@@ -31,5 +33,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # Link naar Unigor
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=Link naar Unigor
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -38,10 +41,11 @@
 SDESC=2Unigor
 DHCP=no
-#MODE=managed
-#ESSID=n-o.unigor.wleiden.net
-#CHANNEL=1
+MODE=managed
+ESSID=n-o.unigor.wleiden.net
+CHANNEL=1
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # Link naar DirkLos1
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=Link naar DirkLos1
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -49,6 +53,6 @@
 DESC=Link naar DirkLos1
 SDESC=2dirklos1
-#MODE=managed
-#ESSID=il-w.dirklos1.wleiden.net
-#CHANNEL=13
+MODE=managed
+ESSID=il-w.dirklos1.wleiden.net
+CHANNEL=13
 VR2
Index: nodes/CNodeCeTIM1/wleiden.conf
===================================================================
--- nodes/CNodeCeTIM1/wleiden.conf	(revision 8260)
+++ nodes/CNodeCeTIM1/wleiden.conf	(revision 8261)
@@ -12,5 +12,6 @@
 $Y='463704';
 
-$config{'ath0'}=sprintf <<ATH0;  # ap's N+O
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap's N+O
 TYPE=wireless
 IP=$master_ip/26
@@ -23,5 +24,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # Ethernet naar proxy2
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Ethernet naar proxy2
 TYPE=ethernet
 IP=172.17.143.2/28
@@ -31,5 +33,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # Ethernet naar CeTIM2
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=Ethernet naar CeTIM2
 TYPE=ethernet
 IP=172.16.0.33/30                                                        
@@ -39,5 +42,6 @@
 VR1
                                                                                 
-$config{'vr2'}=sprintf <<VR2;  # a-link Nanostation5 Noord-Oost
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=a-link Nanostation5 Noord-Oost
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -46,10 +50,11 @@
 SDESC=NScetim1-n
 DHCP=no
-#ESSID=il-no.cetim1.wleiden.net
-#CHANNEL=140
+ESSID=il-no.cetim1.wleiden.net
+CHANNEL=140
 #mode 11a bridge master
 VR2
 
-$config{'vr2:0'}=sprintf <<VR20;  # a-link Houtmarkt
+$config{'vr2:0'}=sprintf <<VR20;
+COMMENT=a-link Houtmarkt
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -59,5 +64,6 @@
 VR20
 
-$config{'vr2:1'}=sprintf <<VR21;  # a-link Spoortje
+$config{'vr2:1'}=sprintf <<VR21;
+COMMENT=a-link Spoortje
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -67,5 +73,6 @@
 VR21
     
-$config{'ue0'}=sprintf <<UE0;  # a-link Nanostation5 Zuid-Oost
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=a-link Nanostation5 Zuid-Oost
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -74,6 +81,6 @@
 SDESC=2roomburgh1
 DHCP=no
-#ESSID=il-zo.cetim1.wleiden.net
-#CHANNEL=132
+ESSID=il-zo.cetim1.wleiden.net
+CHANNEL=132
 #mode 11a bridge master                                                                       
 UE0
Index: nodes/CNodeCeTIM2/wleiden.conf
===================================================================
--- nodes/CNodeCeTIM2/wleiden.conf	(revision 8260)
+++ nodes/CNodeCeTIM2/wleiden.conf	(revision 8261)
@@ -11,5 +11,6 @@
 $Y='463704';
 
-$config{'ath0'}=sprintf <<ATH0;  # APs Z+W
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=APs Z+W
 TYPE=wireless
 IP=$master_ip/26
@@ -22,5 +23,6 @@
 ATH0
 
-$config{'ath0:1'}=sprintf <<ATH01;  # link naar Burcht
+$config{'ath0:1'}=sprintf <<ATH01;
+COMMENT=link naar Burcht
 TYPE=wireless
 IP=172.16.0.105/30
@@ -30,5 +32,6 @@
 ATH01
 
-$config{'vr0'}=sprintf <<VR0;  # Ethernet naar CeTIM1
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Ethernet naar CeTIM1
 TYPE=ethernet
 IP=172.16.0.34/30
@@ -38,5 +41,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # a-link Nanostation5 Noord-West
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=a-link Nanostation5 Noord-West
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -45,10 +49,11 @@
 SDESC=2lvln
 DHCP=no
-#ESSID=il-nw.cetim2.wleiden.net
-#CHANNEL=124
+ESSID=il-nw.cetim2.wleiden.net
+CHANNEL=124
 #mode 11a bridge master                                                                       
 VR1
 
-$config{'vr1:1'}=sprintf <<VR11;  # link naar OB
+$config{'vr1:1'}=sprintf <<VR11;
+COMMENT=link naar OB
 TYPE=ethernet
 IP=172.16.0.161/30
@@ -58,5 +63,6 @@
 VR11
 
-$config{'vr1:2'}=sprintf <<VR12;  # link naar Rund
+$config{'vr1:2'}=sprintf <<VR12;
+COMMENT=link naar Rund
 TYPE=ethernet
 IP=172.16.0.181/30
@@ -66,5 +72,6 @@
 VR12
 
-$config{'vr2'}=sprintf <<VR2;  #Interlinks ZW
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=Interlinks ZW
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -73,10 +80,11 @@
 SDESC=2imi
 DHCP=no
-#MODE=11a bridge master
-#ESSID=il-zw.cetim2.wleiden.net
-#CHANNEL=116
+MODE=11a bridge master
+ESSID=il-zw.cetim2.wleiden.net
+CHANNEL=116
 VR2
 
-$config{'vr2:0'}=sprintf <<VR20;  # link naar Huub
+$config{'vr2:0'}=sprintf <<VR20;
+COMMENT=link naar Huub
 TYPE=ethernet
 IP=172.16.4.25/29
@@ -86,5 +94,6 @@
 VR20
 
-$config{'ue0'}=sprintf <<UEO;  # Ethernet naar lokaal AP
+$config{'ue0'}=sprintf <<UEO;
+COMMENT=Ethernet naar lokaal AP
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -93,7 +102,7 @@
 SDESC=lokaalAP
 DHCP=10-250
-#ESSID=ap-WirelessLeiden-HooglandseKerk
-#CHANNEL=6
-#MODE 11b bridge master
+ESSID=ap-WirelessLeiden-HooglandseKerk
+CHANNEL=6
+MODE 11b bridge master
 UEO
 
Index: nodes/CNodeCope/wleiden.conf
===================================================================
--- nodes/CNodeCope/wleiden.conf	(revision 8260)
+++ nodes/CNodeCope/wleiden.conf	(revision 8261)
@@ -10,5 +10,6 @@
 $Y='463889';
 
-$config{'ue0'}=sprintf <<UE0;  # link naar proxy1
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=link naar proxy1
 TYPE=ethernet
 IP=172.17.8.66/28
@@ -17,5 +18,6 @@
 UE0
 
-$config{'ath0'}=sprintf <<ATH0;  # OMNI
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=OMNI
 TYPE=wireless
 IP=$master_ip/26
@@ -36,5 +38,6 @@
 ATH00
 
-$config{'vr0'}=sprintf <<VR0; # a-link naar Unigor via NS5
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=a-link naar Unigor via NS5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -42,13 +45,14 @@
 DESC=Ethernet to interlink UniGor
 SDESC=2unigor
-#Default IP 192.168.1.20 for NS5 management
-#MODE=11a bridge station
-#ESSID=il-zo.unigor.wleiden.net
-#CHANNEL=
-#NS_IP=192.168.1.21
-#NSMAC=00:15:6D:EA:F0:1D
+Default IP 192.168.1.20 for NS5 management
+MODE=11a bridge station
+ESSID=il-zo.unigor.wleiden.net
+CHANNEL=
+NS_IP=192.168.1.21
+NSMAC=00:15:6D:EA:F0:1D
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # a-link naar Stadhuis  via NS5
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=a-link naar Stadhuis  via NS5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -56,13 +60,14 @@
 DESC=Link naar Stadhuis
 SDESC=2stadhuis
-#Default IP 192.168.1.20 for NS5 management
-#MODE=11a bridge managed
-#ESSID=il-nw.stadhuis.wleiden.net
-#CHANNEL=116
-#NS_IP=192.168.1.21
-#NSMAC=00:15:6D:EA:F0:4C
+Default IP 192.168.1.20 for NS5 management
+MODE=11a bridge managed
+ESSID=il-nw.stadhuis.wleiden.net
+CHANNEL=116
+NS_IP=192.168.1.21
+NSMAC=00:15:6D:EA:F0:4C
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # a-link naar Rabo via NS5
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=a-link naar Rabo via NS5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -70,8 +75,8 @@
 DESC=ethernet to interlink 
 SDESC=2rabo
-#Default IP 192.168.1.20 for NS5 management
-#MODE=managed
-#ESSID=il-z.rabo.wleiden.net
-#CHANNEL=44
-#NSMAC=00:15:6D:EA:F0:0F
+Default IP 192.168.1.20 for NS5 management
+MODE=managed
+ESSID=il-z.rabo.wleiden.net
+CHANNEL=44
+NSMAC=00:15:6D:EA:F0:0F
 VR2
Index: nodes/CNodeDeClercq/wleiden.conf
===================================================================
--- nodes/CNodeDeClercq/wleiden.conf	(revision 8260)
+++ nodes/CNodeDeClercq/wleiden.conf	(revision 8261)
@@ -9,5 +9,6 @@
 $Y='462845';
 
-$config{'ath0'}=sprintf <<ATH0;  # Ap voor buurt
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=Ap voor buurt
 TYPE=wireless
 IP=$master_ip/26
@@ -21,5 +22,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # ethernet to local subnet with PoE
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=ethernet to local subnet with PoE
 TYPE=ethernet
 IP=172.16.4.53/30
@@ -30,5 +32,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # a-link to Roomburgh3 via Nanostation5
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=a-link to Roomburgh3 via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -36,11 +39,12 @@
 DESC=Ethernet to interlink west (Roomburgh3)
 SDESC=2roomburgh3
-#MODE=master
-#ESSID=il-w.declercq.wleiden.net
-#CHANNEL=52
-#NSMAC=00:15:6D:EA:F0:70
+MODE=master
+ESSID=il-w.declercq.wleiden.net
+CHANNEL=52
+NSMAC=00:15:6D:EA:F0:70
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # a-link to Leythenrode  via Nanostation5
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=a-link to Leythenrode  via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -48,11 +52,12 @@
 DESC=ethernet to interlink north-east
 SDESC=2leythenrode
-#MODE=managed
-#ESSID=il-zw.leythenrode.wleiden.net
-#CHANNEL=44
-#NSMAC=00:15:6D:EA:F0:7B
+MODE=managed
+ESSID=il-zw.leythenrode.wleiden.net
+CHANNEL=44
+NSMAC=00:15:6D:EA:F0:7B
 VR2
 
-$config{'ue0'}=sprintf <<UE0; # a-link to Stadhuis  via Nanostation5
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=a-link to Stadhuis  via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -60,8 +65,8 @@
 DESC=ethernet to interlink 
 SDESC=2stadhuis
-#MODE=managed
-#ESSID=il-o.stadhuis.wleiden.net
-#CHANNEL=36
-#NSMAC=00:15:6D:EA:F0:63
+MODE=managed
+ESSID=il-o.stadhuis.wleiden.net
+CHANNEL=36
+NSMAC=00:15:6D:EA:F0:63
 UE0
 
Index: nodes/CNodeDirkLos1/wleiden.conf
===================================================================
--- nodes/CNodeDirkLos1/wleiden.conf	(revision 8260)
+++ nodes/CNodeDirkLos1/wleiden.conf	(revision 8261)
@@ -18,8 +18,9 @@
 MODE=managed
 ESSID=n-o.unigor.wleiden.net
-#CHANNEL=1
+CHANNEL=1
 ATH0
 
-$config{'vr0'}=sprintf <<VR0; # a-link naar geluidsnet1
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=a-link naar geluidsnet1
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -28,12 +29,13 @@
 SDESC=2geluidsnet1
 DHCP=no
-#MODE=ap
-#ESSID=il-zw.geluidsnet1.wleiden.net
-#CHANNEL=140
-#NSMAC=00:15:6D:F6:BE:FF
-#NSIP=172.16.4.155/29
+MODE=ap
+ESSID=il-zw.geluidsnet1.wleiden.net
+CHANNEL=140
+NSMAC=00:15:6D:F6:BE:FF
+NSIP=172.16.4.155/29
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # a-link to Vosko3
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=a-link to Vosko3
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -42,12 +44,13 @@
 SDESC=2Vosko3
 DHCP=no
-#MODE=station
-#ESSID=il-wnw.vosko3.wleiden.net
-#CHANNEL=100
-#NSMAC=00:15:6D:F6:BE:EB
-#NSIP=172.16.4.75/29
+MODE=station
+ESSID=il-wnw.vosko3.wleiden.net
+CHANNEL=100
+NSMAC=00:15:6D:F6:BE:EB
+NSIP=172.16.4.75/29
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # a-link naar Cam
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=a-link naar Cam
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -56,12 +59,13 @@
 SDESC=2cam
 DHCP=no
-#MODE=ap
-#ESSID=il-zw.dirklos1.wleiden.net
-#CHANNEL=44
-#NSMAC=00:15:6D:70:53:52
-#NSIP=172.16.4.90/29
+MODE=ap
+ESSID=il-zw.dirklos1.wleiden.net
+CHANNEL=44
+NSMAC=00:15:6D:70:53:52
+NSIP=172.16.4.90/29
 VR2
 
-$config{'ue0'}=sprintf <<UE0;  # lokaal ethernet via switch in voedingskast met PoE
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=lokaal ethernet via switch in voedingskast met PoE
 TYPE=ethernet
 IP=172.16.3.58/30
@@ -71,5 +75,6 @@
 UE0
 
-$config{'ue0:0'}=sprintf <<UE00;  # alias voor lokaal ethernet naar DirkLos2
+$config{'ue0:0'}=sprintf <<UE00;
+COMMENT=alias voor lokaal ethernet naar DirkLos2
 TYPE=ethernet
 IP=172.16.176.66/27
Index: nodes/CNodeDirkLos2/wleiden.conf
===================================================================
--- nodes/CNodeDirkLos2/wleiden.conf	(revision 8260)
+++ nodes/CNodeDirkLos2/wleiden.conf	(revision 8261)
@@ -10,5 +10,6 @@
 $Y='464748';
 
-$config{'ath0'}=sprintf <<AT0;  # Ap voor buurt
+$config{'ath0'}=sprintf <<AT0;
+COMMENT=Ap voor buurt
 TYPE=wireless
 IP=$master_ip/26
@@ -21,5 +22,6 @@
 AT0
 
-$config{'vr0'}=sprintf <<VR0; # interlink west (unigor)
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=interlink west (unigor)
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -28,10 +30,11 @@
 SDESC=2Unigor
 DHCP=no
-#MODE=station
-#ESSID=il-o.unigor.wleiden.net
-#CHANNEL=52
+MODE=station
+ESSID=il-o.unigor.wleiden.net
+CHANNEL=52
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # interlink noord-oost Rabo2
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=interlink noord-oost Rabo2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -40,10 +43,11 @@
 SDESC=2Rabo2
 DHCP=no
-#MODE=master
-#ESSID=il-no.dirklos2.wleiden.net
-#CHANNEL=140
+MODE=master
+ESSID=il-no.dirklos2.wleiden.net
+CHANNEL=140
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # interlink zuid-oost (stadhuis2)
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=interlink zuid-oost (stadhuis2)
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -52,7 +56,7 @@
 SDESC=2Stadhuis
 DHCP=no
-#MODE=managed
-#ESSID=il-nw.stadhuis2.wleiden.net
-#CHANNEL=36
+MODE=managed
+ESSID=il-nw.stadhuis2.wleiden.net
+CHANNEL=36
 VR2
 
@@ -65,5 +69,6 @@
 VR20
 
-$config{'ue0'}=sprintf <<UE0;  # lokaal ethernet via switch in voedingskast met PoE
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=lokaal ethernet via switch in voedingskast met PoE
 TYPE=ethernet
 IP=172.16.3.57/30
@@ -73,5 +78,6 @@
 UE0
 
-$config{'ue0:0'}=sprintf <<UE00;  # alias voor lokaal ethernet naar DirkLos1
+$config{'ue0:0'}=sprintf <<UE00;
+COMMENT=alias voor lokaal ethernet naar DirkLos1
 TYPE=ethernet
 IP=172.16.176.65/27
Index: nodes/CNodeGeluidsnet1/wleiden.conf
===================================================================
--- nodes/CNodeGeluidsnet1/wleiden.conf	(revision 8260)
+++ nodes/CNodeGeluidsnet1/wleiden.conf	(revision 8261)
@@ -12,5 +12,6 @@
 $LAT='52.164';
 
-$config{'ath0'}=sprintf <<ATH0;  # ap
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap
 TYPE=wireless
 IP=$master_ip/26
@@ -23,5 +24,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # Link naar Geluidsnet2
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Link naar Geluidsnet2
 TYPE=ethernet
 IP=172.16.4.185/30
@@ -31,5 +33,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # Link naar Lebkov
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=Link naar Lebkov
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -38,12 +41,13 @@
 SDESC=2lebkov
 DHCP=no
-#MODE=master wds
-#ESSID=il-n.geluidsnet1.wleiden.net
-#CHANNEL=36
-#NSMAC=00:15:6D:EC:81:7B
-#NS_IP=172.16.4.162/29
+MODE=master wds
+ESSID=il-n.geluidsnet1.wleiden.net
+CHANNEL=36
+NSMAC=00:15:6D:EC:81:7B
+NS_IP=172.16.4.162/29
 VR1
 
-$config{'vr2'}=sprintf <<VR2;  # Link naar DirkLos1
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=Link naar DirkLos1
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -52,12 +56,13 @@
 SDESC=2dirklos1
 DHCP=no
-#MODE=master wds
-#ESSID=il-zw.geluidsnet1.wleiden.net
-#CHANNEL=140
-#NSMAC=00:15:6D:EC:82:8C
-#NS_IP=172.16.4.154/29
+MODE=master wds
+ESSID=il-zw.geluidsnet1.wleiden.net
+CHANNEL=140
+NSMAC=00:15:6D:EC:82:8C
+NS_IP=172.16.4.154/29
 VR2
 
-$config{'ue0'}=sprintf <<UE0;  # Link naar Webcam 
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=Link naar Webcam 
 TYPE=ethernet
 IP=172.16.16.1/30
@@ -67,5 +72,6 @@
 UE0
 
-$config{'ue1'}=sprintf <<UE1;  # Link naar XXX
+$config{'ue1'}=sprintf <<UE1;
+COMMENT=Link naar XXX
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -73,9 +79,9 @@
 DESC=b-link naar XXX
 SDESC=2xxx-ue1
-#MODE=XXX
-#ESSID=XX-XX.XXX.wleiden.net
-#CHANNEL=XX
-#NSMAC=
-#NS_IP=172.16.4.170/29
+MODE=XXX
+ESSID=XX-XX.XXX.wleiden.net
+CHANNEL=XX
+NSMAC=
+NS_IP=172.16.4.170/29
 DHCP=no
 UE1
Index: nodes/CNodeGeluidsnet2/wleiden.conf
===================================================================
--- nodes/CNodeGeluidsnet2/wleiden.conf	(revision 8260)
+++ nodes/CNodeGeluidsnet2/wleiden.conf	(revision 8261)
@@ -12,5 +12,6 @@
 $LAT='52.163';
 
-$config{'ath0'}=sprintf <<ATH0;  # ap
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap
 TYPE=wireless
 IP=$master_ip/26
@@ -23,5 +24,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # Link naar Geluidsnet1
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Link naar Geluidsnet1
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -32,5 +34,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # Link naar XXX
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=Link naar XXX
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -38,12 +41,13 @@
 DESC=Link naar XXX
 SDESC=2xxx-vr1
-#MODE=master wds
-#ESSID=il-z.geluidsnet2.wleiden.net
-#CHANNEL=132
-#NSMAC= 00:15:6D:70:4D:6A
-#NS_IP=172.16.4.194/29
+MODE=master wds
+ESSID=il-z.geluidsnet2.wleiden.net
+CHANNEL=132
+NSMAC= 00:15:6D:70:4D:6A
+NS_IP=172.16.4.194/29
 VR1
 
-$config{'vr2'}=sprintf <<VR2;  # Link naar vosko3
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=Link naar vosko3
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -52,25 +56,27 @@
 SDESC=2vosko3
 DHCP=no
-#MODE=station wds
-#ESSID=il-wnw.vosko3.wleiden.net
-#CHANNEL=100
-#NSMAC= 00:15:6D:EC:82:96
-#NS_IP=172.16.4.203/29
+MODE=station wds
+ESSID=il-wnw.vosko3.wleiden.net
+CHANNEL=100
+NSMAC= 00:15:6D:EC:82:96
+NS_IP=172.16.4.203/29
 VR2
 
-$config{'ue0'}=sprintf <<UE0;  # Link naar XXX
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=Link naar XXX
 TYPE=ethernet
 IP=172.16.4.209/29
 DESC=Link naar XXX
 SDESC=2xxx-ue0
-#MODE=master wds
-#ESSID=il-o.geluidsnet2.wleiden.net
-#CHANNEL=64
-#NSMAC=00:15:6D:70:4D:A3
-#NS_IP=172.16.4.210/29
+MODE=master wds
+ESSID=il-o.geluidsnet2.wleiden.net
+CHANNEL=64
+NSMAC=00:15:6D:70:4D:A3
+NS_IP=172.16.4.210/29
 DHCP=no
 UE0
 
-$config{'ue1'}=sprintf <<UE1;  # Link naar XXX
+$config{'ue1'}=sprintf <<UE1;
+COMMENT=Link naar XXX
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -78,9 +84,9 @@
 DESC=b-link naar XXX
 SDESC=2xxx-ue1
-#MODE=XXX
-#ESSID=XX-XX.XXX.wleiden.net
-#CHANNEL=XX
-#NSMAC=
-#NS_IP=172.16.4.218/29
+MODE=XXX
+ESSID=XX-XX.XXX.wleiden.net
+CHANNEL=XX
+NSMAC=
+NS_IP=172.16.4.218/29
 DHCP=no
 UE1
Index: nodes/CNodeGraficall/wleiden.conf
===================================================================
--- nodes/CNodeGraficall/wleiden.conf	(revision 8260)
+++ nodes/CNodeGraficall/wleiden.conf	(revision 8261)
@@ -10,5 +10,6 @@
 $Y='463425';
 
-$config{'ath0'}=sprintf <<ATH0;  # omni
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=omni
 TYPE=wireless
 IP=$master_ip/26
@@ -21,5 +22,6 @@
 ATH0
 
-$config{'ue0'}=sprintf <<UE0;  # b-link to Hoogmade via Bullet2
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=b-link to Hoogmade via Bullet2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -27,7 +29,7 @@
 DESC=Link naar HMKerk2 
 SDESC=2hmkerk2
-#MODE=master
-#ESSID=il-n.graficall.wleiden.net
-#CHANNEL=5
+MODE=master
+ESSID=il-n.graficall.wleiden.net
+CHANNEL=5
 HEIGHT=17
 DHCP=no
@@ -42,5 +44,6 @@
 UE00
 
-$config{'vr0'}=sprintf <<VR0; # a-link to Leythenrode via Nanostation5
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=a-link to Leythenrode via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -49,9 +52,9 @@
 SDESC=2Leythenrode
 DHCP=no
-#MODE=managed bridge
-#ESSID=il-no.leythenrode.wleiden.net
-#CHANNEL=52
-#NSMAC=00:15:6D:EA:F0:4C
-#NS_IP=192.168.1.21
+MODE=managed bridge
+ESSID=il-no.leythenrode.wleiden.net
+CHANNEL=52
+NSMAC=00:15:6D:EA:F0:4C
+NS_IP=192.168.1.21
 VR0
 
@@ -63,9 +66,9 @@
 SDESC=2jvc
 DHCP=no
-#MODE=11a bridge ap
-#ESSID=il-zw.graficall.wleiden.net
-#CHANNEL=36
-#NSMAC=00:15:6D:EA:F0:68
-#NS_IP=192.168.1.20
+MODE=11a bridge ap
+ESSID=il-zw.graficall.wleiden.net
+CHANNEL=36
+NSMAC=00:15:6D:EA:F0:68
+NS_IP=192.168.1.20
 VR1
 
@@ -77,7 +80,7 @@
 SDESC=2som
 DHCP=no
-#MODE=11a bridge ap
-#ESSID=il-nw.graficall.wleiden.net
-#CHANNEL=60
-#NSMAC= 00:15:6D:EB:F0:F8
+MODE=11a bridge ap
+ESSID=il-nw.graficall.wleiden.net
+CHANNEL=60
+NSMAC= 00:15:6D:EB:F0:F8
 VR2
Index: nodes/CNodeGrip/wleiden.conf
===================================================================
--- nodes/CNodeGrip/wleiden.conf	(revision 8260)
+++ nodes/CNodeGrip/wleiden.conf	(revision 8261)
@@ -21,5 +21,6 @@
 
 
-$config{'wi0'}=sprintf <<EW0;  # omni
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=omni
 TYPE=wireless
 IP=$master_ip/26
@@ -38,5 +39,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;  # link naar IMI
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=link naar IMI
 TYPE=wireless
 IP=172.16.0.250/30
@@ -53,5 +55,6 @@
 EW1
 
-$config{'wi2'}=sprintf <<EW2;  # Link naar ROCl
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=Link naar ROCl
 TYPE=wireless
 IP=172.16.0.254/30
@@ -72,5 +75,6 @@
 
 
-$config{'wi3'}=sprintf <<EW3;  # link naar LCPL
+$config{'wi3'}=sprintf <<EW3;
+COMMENT=link naar LCPL
 TYPE=wireless
 IP=172.16.1.1/30
Index: nodes/CNodeHMKerk1/wleiden.conf
===================================================================
--- nodes/CNodeHMKerk1/wleiden.conf	(revision 8260)
+++ nodes/CNodeHMKerk1/wleiden.conf	(revision 8261)
@@ -19,5 +19,6 @@
 $AGGREGATE=22;
 
-$config{'sis0'}=sprintf <<ED0;  # eth port 0 hmkerk1
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=eth port 0 hmkerk1
 TYPE=ethernet
 IP=172.25.60.65/29
@@ -31,5 +32,6 @@
 ED0
 
-$config{'sis1'}=sprintf <<ED0;  # ethernet port 2 kerk2
+$config{'sis1'}=sprintf <<ED0;
+COMMENT=ethernet port 2 kerk2
 TYPE=ethernet
 IP=172.16.1.141/30
@@ -45,5 +47,6 @@
 
 
-$config{'wi0'}=sprintf <<EW0;  # OMNI voor de buurt ap-omni.hmkerk
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=OMNI voor de buurt ap-omni.hmkerk
 TYPE=wireless
 IP=$master_ip/26
@@ -63,5 +66,6 @@
 
 
-$config{'wi1'}=sprintf <<EW1;  # link naar Woubrugge WBrotary
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=link naar Woubrugge WBrotary
 TYPE=wireless
 IP=172.16.2.28/30
Index: nodes/CNodeHMKerk2/wleiden.conf
===================================================================
--- nodes/CNodeHMKerk2/wleiden.conf	(revision 8260)
+++ nodes/CNodeHMKerk2/wleiden.conf	(revision 8261)
@@ -18,5 +18,6 @@
 $AGGREGATE=22;
 
-$config{'sis0'}=sprintf <<ED0;  # eth port 0 HMkerk2
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=eth port 0 HMkerk2
 TYPE=ethernet
 IP=172.25.64.65/29
@@ -30,5 +31,6 @@
 ED0
 
-$config{'sis1'}=sprintf <<ED1;  # eth port 1 naar HMkerk1
+$config{'sis1'}=sprintf <<ED1;
+COMMENT=eth port 1 naar HMkerk1
 TYPE=ethernet
 IP=172.16.1.142/30
@@ -43,5 +45,6 @@
 ED1
 
-$config{'wi0'}=sprintf <<EW0;  # link naar Graficall Wireless Leiden
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=link naar Graficall Wireless Leiden
 TYPE=wireless
 IP=172.16.0.86/30
@@ -58,5 +61,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;  # link naar Struyk Verwo Leimuiden.
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=link naar Struyk Verwo Leimuiden.
 TYPE=wireless
 IP=172.16.1.185/30
@@ -73,5 +77,6 @@
 EW1
 
-$config{'wi1:0'}=sprintf <<EW10;  # link naar HMgw2.
+$config{'wi1:0'}=sprintf <<EW10;
+COMMENT=link naar HMgw2.
 TYPE=wireless
 IP=172.16.2.89/30
Index: nodes/CNodeHaagwijk/wleiden.conf
===================================================================
--- nodes/CNodeHaagwijk/wleiden.conf	(revision 8260)
+++ nodes/CNodeHaagwijk/wleiden.conf	(revision 8261)
@@ -10,5 +10,6 @@
 $Y='461987';
 
-$config{'ath0'}=sprintf <<ATH0;  # ap
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap
 TYPE=wireless
 IP=$master_ip/26
@@ -21,5 +22,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # Link naar ROC
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Link naar ROC
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -28,11 +30,12 @@
 DESC=Link naar ROCl
 SDESC=2rocl
-#MODE=master
-#ESSID=il-o.haagwijk.wleiden.net
-#CHANNEL=140
-#NSMAC=
+MODE=master
+ESSID=il-o.haagwijk.wleiden.net
+CHANNEL=140
+NSMAC=
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # Nanostation5 naar LivingLab
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=Nanostation5 naar LivingLab
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -41,11 +44,12 @@
 SDESC=2livinglab
 DHCP=no
-#MODE=bridge managed
-#ESSID=il-zo.livinglab.wleiden.net
-#CHANNEL=36
-#NSMAC=
+MODE=bridge managed
+ESSID=il-zo.livinglab.wleiden.net
+CHANNEL=36
+NSMAC=
 VR1
 
-$config{'vr2'}=sprintf <<VR2;  # Link naar AJsoft
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=Link naar AJsoft
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -54,25 +58,27 @@
 SDESC=2ajsoft
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-nw.haagwijk.wleiden.net
-#CHANNEL=52
-#NSMAC=00:15:6d:ea:f0:f6
-#NS_IP=192.168.1.20
+MODE=bridge ap
+ESSID=il-nw.haagwijk.wleiden.net
+CHANNEL=52
+NSMAC=00:15:6d:ea:f0:f6
+NS_IP=192.168.1.20
 VR2
 
-$config{'ue0'}=sprintf <<UE0;  # Link naar Rick
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=Link naar Rick
 TYPE=ethernet
 IP=172.16.4.145/29
 DESC=a-link naar Rick
 SDESC=2rick
-#MODE=bridge ap
-#ESSID=il-zw.haagwijk.wleiden.net
-#CHANNEL=40
-#NSMAC=
-#NS_IP=172.16.4.146/29
+MODE=bridge ap
+ESSID=il-zw.haagwijk.wleiden.net
+CHANNEL=40
+NSMAC=
+NS_IP=172.16.4.146/29
 DHCP=no
 UE0
 
-$config{'ue1'}=sprintf <<UE1;  # Link naar LCPL 
+$config{'ue1'}=sprintf <<UE1;
+COMMENT=Link naar LCPL 
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -80,11 +86,12 @@
 DESC=b-link naar LCPL
 SDESC=2lcpl
-#MODE=bridge ap
-#ESSID=il-o.haagwijk.wleiden.net
-#CHANNEL=1
+MODE=bridge ap
+ESSID=il-o.haagwijk.wleiden.net
+CHANNEL=1
 DHCP=no
 UE1
 
-$config{'ue1:1'}=sprintf <<UE11;  # Link naar Lorentzhof
+$config{'ue1:1'}=sprintf <<UE11;
+COMMENT=Link naar Lorentzhof
 TYPE=wireless
 IP=172.16.1.230/30
Index: nodes/CNodeHans/wleiden.conf
===================================================================
--- nodes/CNodeHans/wleiden.conf	(revision 8260)
+++ nodes/CNodeHans/wleiden.conf	(revision 8261)
@@ -18,5 +18,6 @@
 $Y='460430';
 
-$config{'xl0'}=sprintf <<ED0;  # Local ethernet
+$config{'xl0'}=sprintf <<ED0;
+COMMENT=Local ethernet
 
 TYPE=ethernet
@@ -25,5 +26,5 @@
 DESC=Ethernet lokaal
 SDESC=eth0
-#DHCP=68-70
+DHCP=68-70
 DHCP=no
 
@@ -46,5 +47,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;  # Link naar AA24
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=Link naar AA24
 TYPE=wireless
 IP=172.16.2.41/30
@@ -65,5 +67,6 @@
 EW1
 
-$config{'wi2'}=sprintf <<EW2;  # link naar Gerard
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=link naar Gerard
 TYPE=wireless
 IP=172.16.1.189/30
Index: nodes/CNodeHofland/wleiden.conf
===================================================================
--- nodes/CNodeHofland/wleiden.conf	(revision 8260)
+++ nodes/CNodeHofland/wleiden.conf	(revision 8261)
@@ -10,5 +10,6 @@
 $Y='462384';
 
-$config{'wi0'}=sprintf <<WI0;  # ap 
+$config{'wi0'}=sprintf <<WI0;
+COMMENT=ap 
 TYPE=wireless
 IP=$master_ip/26
@@ -21,5 +22,6 @@
 WI0
 
-$config{'sis0'}=sprintf <<SIS0;  # Ethernet
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=10.0.0.1/24
@@ -29,5 +31,6 @@
 SIS0
 
-$config{'sis1'}=sprintf <<SIS1;  # link AJSoft2
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=link AJSoft2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -36,13 +39,14 @@
 SDESC=2ajsoft2
 DHCP=no
-#MODE=bridge managed
-#ESSID=il-w.ajsoft2.wleiden.net
-#CHANNEL=100
-#NSMAC=00:15:6D:70:53:4A
-#NS_IP=192.168.1.21
+MODE=bridge managed
+ESSID=il-w.ajsoft2.wleiden.net
+CHANNEL=100
+NSMAC=00:15:6D:70:53:4A
+NS_IP=192.168.1.21
 SIS1
 
 
-$config{'wi1'}=sprintf <<WI1;# naar Voorschoten
+$config{'wi1'}=sprintf <<WI1;
+COMMENT=naar Voorschoten
 TYPE=wireless
 IP=172.20.149.1/26
Index: nodes/CNodeHofwijck/wleiden.conf
===================================================================
--- nodes/CNodeHofwijck/wleiden.conf	(revision 8260)
+++ nodes/CNodeHofwijck/wleiden.conf	(revision 8261)
@@ -10,5 +10,6 @@
 $Y='466629';
 
-$config{'ath0'}=sprintf <<ATH0;  # ap voor de buurt
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap voor de buurt
 TYPE=wireless
 IP=$master_ip/26
@@ -21,5 +22,6 @@
 ATH0
 
-$config{'ue0'}=sprintf <<UE0;  # Ethernet naar Hofwijck
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=Ethernet naar Hofwijck
 TYPE=ethernet
 IP=172.23.16.65/28
@@ -28,5 +30,6 @@
 UE0
 
-$config{'vr0'}=sprintf <<VR0; # b-Link naar Lange Voort
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=b-Link naar Lange Voort
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -35,12 +38,13 @@
 SDESC=2langevoort
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-w.hofwijck.wleiden.net
-#CHANNEL=3
-#Bullet_IP=192.168.1.20
-#BulletMAC=00:15:6D:E8:E7:37
+MODE=bridge ap
+ESSID=il-w.hofwijck.wleiden.net
+CHANNEL=3
+Bullet_IP=192.168.1.20
+BulletMAC=00:15:6D:E8:E7:37
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # Link naar UniGorN
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=Link naar UniGorN
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -49,12 +53,13 @@
 SDESC=2unigorn
 DHCP=no
-#MODE=bridge station
-#ESSID=il-o.unigorn.wleiden.net
-#CHANNEL=104
-#NS_IP=192.168.1.21
-#NSMAC=00:15:6D:F6:BE:DB
+MODE=bridge station
+ESSID=il-o.unigorn.wleiden.net
+CHANNEL=104
+NS_IP=192.168.1.21
+NSMAC=00:15:6D:F6:BE:DB
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # Link naar Lijtweg1
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=Link naar Lijtweg1
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -63,9 +68,9 @@
 SDESC=2lijtweg1
 DHCP=no
-#MODE=bridge station
-#ESSID=il-o.lijtweg1.wleiden.net
-#CHANNEL=124
-#NS_IP=192.168.1.21
-#NSMAC=00:15:6D:F6:BE:D0
+MODE=bridge station
+ESSID=il-o.lijtweg1.wleiden.net
+CHANNEL=124
+NS_IP=192.168.1.21
+NSMAC=00:15:6D:F6:BE:D0
 VR2
 
Index: nodes/CNodeHoutmarkt/wleiden.conf
===================================================================
--- nodes/CNodeHoutmarkt/wleiden.conf	(revision 8260)
+++ nodes/CNodeHoutmarkt/wleiden.conf	(revision 8261)
@@ -19,5 +19,6 @@
 $Y='464299';
 
-$config{'ep0'}=sprintf <<ED0;  # Ethernet
+$config{'ep0'}=sprintf <<ED0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.19.8.65/28
@@ -34,5 +35,6 @@
 
 
-$config{'wi0'}=sprintf <<EW;   # Omni
+$config{'wi0'}=sprintf <<EW;
+COMMENT=Omni
 TYPE=wireless
 IP=$master_ip/26
@@ -50,5 +52,6 @@
 EW
 
-$config{'wi1'}=sprintf <<EW;  # active test AP
+$config{'wi1'}=sprintf <<EW;
+COMMENT=active test AP
 TYPE=wireless
 IP=172.19.8.81/30
@@ -65,5 +68,6 @@
 EW
 
-$config{'wi2'}=sprintf <<EW;  # link naar Cetim2 
+$config{'wi2'}=sprintf <<EW;
+COMMENT=link naar Cetim2 
 TYPE=wireless
 IP=172.16.0.42/30
@@ -77,5 +81,5 @@
 ESSID=il-no.cetim2.wleiden.net
 
-#CHANNEL=10
+CHANNEL=10
 
 
@@ -84,5 +88,6 @@
 EW
 
-$config{'wi3'}=sprintf <<EW;  # link naar Som 
+$config{'wi3'}=sprintf <<EW;
+COMMENT=link naar Som 
 TYPE=wireless
 IP=172.16.0.50/30
@@ -97,5 +102,5 @@
 MODE=managed
 ESSID=il-z.som.wleiden.net
-#CHANNEL=5
+CHANNEL=5
 
 
Index: nodes/CNodeHuub/wleiden.conf
===================================================================
--- nodes/CNodeHuub/wleiden.conf	(revision 8260)
+++ nodes/CNodeHuub/wleiden.conf	(revision 8261)
@@ -10,5 +10,6 @@
 $Y='463569';
 
-$config{'ath0'}=sprintf <<AT0;  # Ap
+$config{'ath0'}=sprintf <<AT0;
+COMMENT=Ap
 TYPE=wireless
 IP=$master_ip/26
@@ -21,5 +22,6 @@
 AT0
 
-$config{'sis0'}=sprintf <<EE0;  # Local ethernet to proxy
+$config{'sis0'}=sprintf <<EE0;
+COMMENT=Local ethernet to proxy
 TYPE=ethernet
 IP=172.17.16.65/30
@@ -29,5 +31,6 @@
 EE0
 
-$config{'sis1'}=sprintf <<SIS1;  # link naar Rabo1 
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=link naar Rabo1 
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -36,12 +39,13 @@
 SDESC=2rabo1
 DHCP=no
-#MODE=managed
-#ESSID=il-z.rabo.wleiden.net
-#CHANNEL=44
-#NSMAC=00:15:6D:BD:89:CB
-#NSIP=172.16.4.11/29
+MODE=managed
+ESSID=il-z.rabo.wleiden.net
+CHANNEL=44
+NSMAC=00:15:6D:BD:89:CB
+NSIP=172.16.4.11/29
 SIS1
 
-$config{'sis2'}=sprintf <<SIS2;  # link naar Cetim2
+$config{'sis2'}=sprintf <<SIS2;
+COMMENT=link naar Cetim2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -50,12 +54,13 @@
 SDESC=2cetim2
 DHCP=no
-#MODE=managed bridge
-#ESSID=il-zw.cetim2.wleiden.net
-#CHANNEL=
-#NSMAC=00:15:6D:F2:39:3D
-#NSIP=172.16.4.29/29
+MODE=managed bridge
+ESSID=il-zw.cetim2.wleiden.net
+CHANNEL=
+NSMAC=00:15:6D:F2:39:3D
+NSIP=172.16.4.29/29
 SIS2
 
-$config{'sis3'}=sprintf <<SIS3; # link naar Vosko2
+$config{'sis3'}=sprintf <<SIS3;
+COMMENT=link naar Vosko2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -64,12 +69,13 @@
 SDESC=2vosko2
 DHCP=no
-#MODE=managed bridge
-#ESSID=il-w.vosko2.wleiden.net
-#CHANNEL=64
-#NSMAC=00:15:6D:70:54:BA
-#NSIP=172.16.4.123/29
+MODE=managed bridge
+ESSID=il-w.vosko2.wleiden.net
+CHANNEL=64
+NSMAC=00:15:6D:70:54:BA
+NSIP=172.16.4.123/29
 SIS3
 
-$config{'sis4'}=sprintf <<SIS4; # link naar Stadhuis
+$config{'sis4'}=sprintf <<SIS4;
+COMMENT=link naar Stadhuis
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -78,10 +84,11 @@
 SDESC=2stadhuis
 DHCP=no
-#MODE=managed
-#ESSID=ap-w.stadhuis.wleiden.net
-#CHANNEL=
+MODE=managed
+ESSID=ap-w.stadhuis.wleiden.net
+CHANNEL=
 SIS4
 
-$config{'sis5'}=sprintf <<SIS5; # link to server
+$config{'sis5'}=sprintf <<SIS5;
+COMMENT=link to server
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
Index: nodes/CNodeIMI/wleiden.conf
===================================================================
--- nodes/CNodeIMI/wleiden.conf	(revision 8260)
+++ nodes/CNodeIMI/wleiden.conf	(revision 8261)
@@ -10,5 +10,6 @@
 $Y='463311';
 
-$config{'ath0'}=sprintf <<ATH0;  # ap 
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap 
 TYPE=wireless
 IP=$master_ip/26
@@ -21,5 +22,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # link naar RijnVliet
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=link naar RijnVliet
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -28,11 +30,12 @@
 DESC=Link naar rijnvliet
 SDESC=2rijnvliet
-#MODE=managed
-#ESSID=il-no.rv.wleiden.net
-#CHANNEL=60
-#NSMAC=00:15:6D:
+MODE=managed
+ESSID=il-no.rv.wleiden.net
+CHANNEL=60
+NSMAC=00:15:6D:
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # link naar CeTIM
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=link naar CeTIM
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -41,11 +44,12 @@
 DESC=Link naar CeTIM2
 SDESC=2cetim2
-#MODE=managed
-#ESSID=il-zw.cetim2.wleiden.net
-#CHANNEL=116
-#NSMAC=00:15:6D:
+MODE=managed
+ESSID=il-zw.cetim2.wleiden.net
+CHANNEL=116
+NSMAC=00:15:6D:
 VR1
 
-$config{'vr2'}=sprintf <<VR2;  # b-link naar Grip
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=b-link naar Grip
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -54,11 +58,12 @@
 DESC=b-Link naar Grip
 SDESC=b2grip
-#MODE=bridge ap
-#ESSID=il-zo.imi.wleiden.net
-#CHANNEL=4
-#BulletMAC=00:15:6D:
+MODE=bridge ap
+ESSID=il-zo.imi.wleiden.net
+CHANNEL=4
+BulletMAC=00:15:6D:
 VR2
 
-$config{'ue0'}=sprintf <<UE0; # b-Link naar Thomas
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=b-Link naar Thomas
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -67,11 +72,12 @@
 DESC=Link naar Thomas
 SDESC=2thomas
-#MODE=bridge ap
-#ESSID=il-no.imi.wleiden.net
-#CHANNEL=7
-#BulletMAC=00:15:6D:
+MODE=bridge ap
+ESSID=il-no.imi.wleiden.net
+CHANNEL=7
+BulletMAC=00:15:6D:
 UE0
 
-$config{'ue0:0'}=sprintf <<UE00;# b-Link naar LvLz
+$config{'ue0:0'}=sprintf <<UE00;
+COMMENT=b-Link naar LvLz
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
Index: nodes/CNodeJVC/wleiden.conf
===================================================================
--- nodes/CNodeJVC/wleiden.conf	(revision 8260)
+++ nodes/CNodeJVC/wleiden.conf	(revision 8261)
@@ -10,5 +10,6 @@
 $Y='461946';
 
-$config{'ath0'}=sprintf <<ATH0;  # omni
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=omni
 TYPE=wireless
 IP=$master_ip/26
@@ -21,5 +22,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0; # a-link to Graficall via Nanostation5
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=a-link to Graficall via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -28,11 +30,12 @@
 SDESC=2graficall
 DHCP=no
-#MODE=11a bridge managed
-#ESSID=il-zw.graficall.wleiden.net
-#CHANNEL=36
-#NSMAC=
+MODE=11a bridge managed
+ESSID=il-zw.graficall.wleiden.net
+CHANNEL=36
+NSMAC=
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # link naar ROCl
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=link naar ROCl
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -41,11 +44,12 @@
 SDESC=2ROC
 DHCP=no
-#MODE=11a bridge ap
-#ESSID=il-w.jvc.wleiden.net
-#CHANNEL=108
-#NSMAC=
+MODE=11a bridge ap
+ESSID=il-w.jvc.wleiden.net
+CHANNEL=108
+NSMAC=
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # link naar Zwet 
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=link naar Zwet 
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -54,8 +58,8 @@
 SDESC=2Zwet
 DHCP=no
-#MODE=11a bridge ap
-#ESSID=il-z.jvc.wleiden.net
-#CHANNEL=60
-#NSMAC=
+MODE=11a bridge ap
+ESSID=il-z.jvc.wleiden.net
+CHANNEL=60
+NSMAC=
 VR2
 
Index: nodes/CNodeKaag/wleiden.conf
===================================================================
--- nodes/CNodeKaag/wleiden.conf	(revision 8260)
+++ nodes/CNodeKaag/wleiden.conf	(revision 8261)
@@ -19,5 +19,6 @@
 $Y='469717';
 
-$config{'sis0'}=sprintf <<ED0;  # Ethernet
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.27.0.65/28
@@ -31,5 +32,6 @@
 ED0
 
-$config{'wi0'}=sprintf <<EW0;  # Omni voor de buurt
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=Omni voor de buurt
 TYPE=wireless
 IP=$master_ip/26
@@ -38,5 +40,5 @@
 
 
-#DHCP=no
+DHCP=no
 DHCP=10-60
 
@@ -49,5 +51,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;  # link naar UniGorN
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=link naar UniGorN
 TYPE=wireless
 IP=172.16.0.218/30
Index: nodes/CNodeKaag2/wleiden.conf
===================================================================
--- nodes/CNodeKaag2/wleiden.conf	(revision 8260)
+++ nodes/CNodeKaag2/wleiden.conf	(revision 8261)
@@ -19,5 +19,6 @@
 $Y='470298';
 
-$config{'sis0'}=sprintf <<ED0;  # Ethernet
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.27.8.65/26
@@ -27,10 +28,11 @@
 ED0
 
-$config{'wi0'}=sprintf <<EW0;  # Omni voor de buurt
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=Omni voor de buurt
 TYPE=wireless
 IP=$master_ip/26
 DESC=Omni voor de buurt
 SDESC=omni
-#DHCP=no
+DHCP=no
 DHCP=10-60
 MODE=master
@@ -39,5 +41,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;  # link naar UnigorN 
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=link naar UnigorN 
 TYPE=wireless
 IP=172.16.1.46/30
Index: nodes/CNodeKoster/wleiden.conf
===================================================================
--- nodes/CNodeKoster/wleiden.conf	(revision 8260)
+++ nodes/CNodeKoster/wleiden.conf	(revision 8261)
@@ -20,5 +20,6 @@
 #$AGGREGATE=22;
 
-$config{'sis0'}=sprintf <<SIS0;  # Ethernet (Proxy)
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=Ethernet (Proxy)
 TYPE=ethernet
 IP=172.17.255.228/29
@@ -27,5 +28,5 @@
 SDESC=eth
 
-#DHCP=68-70
+DHCP=68-70
 DHCP=no
 
@@ -34,5 +35,6 @@
 SIS0
 
-$config{'sis1'}=sprintf <<SIS1;  # Ethernet
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.28.176.75/29
@@ -47,5 +49,6 @@
 
 
-$config{'wi0'}=sprintf <<EW0;  # OMNI
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=OMNI
 TYPE=wireless
 IP=$master_ip/26
@@ -66,5 +69,6 @@
 
 
-$config{'wi1'}=sprintf <<EW1;  # interlink naar noord HWFortis2
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=interlink naar noord HWFortis2
 TYPE=wireless
 IP=172.28.1.158/30
@@ -83,5 +87,6 @@
 
 
-$config{'wi2'}=sprintf <<EW2;  # interlink naar Stadhuis
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=interlink naar Stadhuis
 TYPE=wireless
 IP=172.28.1.129/30
Index: nodes/CNodeLCPL/wleiden.conf
===================================================================
--- nodes/CNodeLCPL/wleiden.conf	(revision 8260)
+++ nodes/CNodeLCPL/wleiden.conf	(revision 8261)
@@ -20,5 +20,6 @@
 $LOKATIE='Roseveltstraat 4c, Leiden';
 
-$config{'sis0'}=sprintf <<ED0;  # Ethernet
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.21.16.65/28
@@ -32,5 +33,6 @@
 ED0
 
-$config{'sis0:0'}=sprintf <<ED00;  # Ethernet
+$config{'sis0:0'}=sprintf <<ED00;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.21.16.97/27
@@ -44,5 +46,6 @@
 ED00
 
-$config{'sis0:1'}=sprintf <<ED01; # Ethernet
+$config{'sis0:1'}=sprintf <<ED01;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.21.16.129/28
@@ -56,5 +59,6 @@
 ED01
 
-$config{'wi0'}=sprintf <<EW0;  # omni
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=omni
 TYPE=wireless
 IP=$master_ip/26
@@ -73,5 +77,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1; #Link naar Haagwijk
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=Link naar Haagwijk
 
 TYPE=wireless
@@ -84,5 +89,5 @@
 ESSID=il-o.haagwijk.wleiden.net
 
-#CHANNEL=9
+CHANNEL=9
 
 
@@ -91,5 +96,6 @@
 EW1
 
-$config{'wi2'}=sprintf <<EW2;  # Link naar Grip 
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=Link naar Grip 
 TYPE=wireless
 IP=172.16.1.2/30
@@ -101,5 +107,5 @@
 ESSID=il-zw.grip.wleiden.net
 
-#CHANNEL=9
+CHANNEL=9
 
 
Index: nodes/CNodeLMdorp/wleiden.conf
===================================================================
--- nodes/CNodeLMdorp/wleiden.conf	(revision 8260)
+++ nodes/CNodeLMdorp/wleiden.conf	(revision 8261)
@@ -19,5 +19,6 @@
 $LOCATION='Dorpskerk, Dorpsstraat, Leimuiden';
 
-$config{'sis0'}=sprintf <<ED0;  # eth
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=eth
 TYPE=ethernet
 IP=172.25.40.65/29
@@ -29,5 +30,6 @@
 ED0
 
-$config{'wi0'}=sprintf <<EW0;  # OMNI
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=OMNI
 TYPE=wireless
 IP=$master_ip/26
@@ -46,5 +48,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;  # link naar LMKempers1
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=link naar LMKempers1
 TYPE=wireless
 IP=172.16.1.194/30
@@ -55,5 +58,5 @@
 MODE=managed
 ESSID=il-zw.kmprs.wleiden.net
-#CHANNEL=1
+CHANNEL=1
 
 
@@ -62,5 +65,6 @@
 EW1
 
-$config{'wi2'}=sprintf <<EW2;  # link naar Space
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=link naar Space
 TYPE=wireless
 IP=172.16.0.61/30
Index: nodes/CNodeLMkempers1/wleiden.conf
===================================================================
--- nodes/CNodeLMkempers1/wleiden.conf	(revision 8260)
+++ nodes/CNodeLMkempers1/wleiden.conf	(revision 8261)
@@ -17,5 +17,6 @@
 $AGGREGATE=22;
 
-$config{'sis0'}=sprintf <<ED0;  # ethernet poort 0 Soekris
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=ethernet poort 0 Soekris
 TYPE=ethernet
 IP=$master_ip/29
@@ -29,5 +30,6 @@
 ED0
 
-$config{'sis1'}=sprintf <<ED1;  # eth poort 1 naar node kempers2 
+$config{'sis1'}=sprintf <<ED1;
+COMMENT=eth poort 1 naar node kempers2 
 TYPE=ethernet
 IP=172.16.1.201/30
@@ -42,5 +44,6 @@
 ED1
 
-$config{'wi0'}=sprintf <<EW0;  # Link naar LMDorp 
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=Link naar LMDorp 
 TYPE=wireless
 IP=172.16.1.193/30
@@ -56,5 +59,6 @@
 EW0
 
-$config{'wi0:0'}=sprintf <<EW00; #link naar lmstruykverwo2
+$config{'wi0:0'}=sprintf <<EW00;
+COMMENT=link naar lmstruykverwo2
 TYPE=wireless
 IP=172.16.1.205/30
@@ -69,5 +73,6 @@
 EW00
 
-$config{'wi1'}=sprintf <<EW1;  # link kempers naar BDBoon
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=link kempers naar BDBoon
 TYPE=wireless
 IP=172.16.1.213/30
Index: nodes/CNodeLMkempers2/wleiden.conf
===================================================================
--- nodes/CNodeLMkempers2/wleiden.conf	(revision 8260)
+++ nodes/CNodeLMkempers2/wleiden.conf	(revision 8261)
@@ -16,5 +16,6 @@
 $Y='471200';
 
-$config{'sis0'}=sprintf <<ED0;  # eth poort 0 Kempers2
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=eth poort 0 Kempers2
 TYPE=ethernet
 IP=172.25.84.65/29
@@ -27,5 +28,6 @@
 ED0
 
-$config{'sis1'}=sprintf <<ED1;  # eth Link naar Kempers1
+$config{'sis1'}=sprintf <<ED1;
+COMMENT=eth Link naar Kempers1
 TYPE=ethernet
 IP=172.16.1.202/30
@@ -39,5 +41,6 @@
 ED1
 
-$config{'ath0'}=sprintf <<EW0;  # OMNI voor Westeinder
+$config{'ath0'}=sprintf <<EW0;
+COMMENT=OMNI voor Westeinder
 TYPE=wireless
 IP=$master_ip/26
@@ -55,5 +58,6 @@
 EW0
 
-$config{'wi0'}=sprintf <<EW1;  # Link naar AMWTR
+$config{'wi0'}=sprintf <<EW1;
+COMMENT=Link naar AMWTR
 TYPE=wireless
 IP=172.16.1.209/30
Index: nodes/CNodeLMstruykverwo1/wleiden.conf
===================================================================
--- nodes/CNodeLMstruykverwo1/wleiden.conf	(revision 8260)
+++ nodes/CNodeLMstruykverwo1/wleiden.conf	(revision 8261)
@@ -19,5 +19,6 @@
 $AGGREGATE=22;
 
-$config{'sis0'}=sprintf <<ED0;  # ethernet poort 0
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=ethernet poort 0
 TYPE=ethernet
 IP=172.25.70.65/29
@@ -30,5 +31,6 @@
 ED0
 
-$config{'sis1'}=sprintf <<ED0;  # ethernet poort naar Struykverwo2
+$config{'sis1'}=sprintf <<ED0;
+COMMENT=ethernet poort naar Struykverwo2
 TYPE=ethernet
 IP=172.16.1.181/30
@@ -42,5 +44,6 @@
 ED0
 
-$config{'wi0'}=sprintf <<EW0;  # link Rijnsaterwoude Gem Huis, (was hoofdorp)
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=link Rijnsaterwoude Gem Huis, (was hoofdorp)
 TYPE=wireless
 IP=172.16.1.54/30
@@ -56,5 +59,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1; # OMNI voor de buurt ap.lmstruykverwo.wleiden.net
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=OMNI voor de buurt ap.lmstruykverwo.wleiden.net
 TYPE=wireless
 IP=$master_ip/26
@@ -72,5 +76,6 @@
 EW1
 
-$config{'wi2'}=sprintf <<EW2;  # Inter link hoogmade - struyk Verwo
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=Inter link hoogmade - struyk Verwo
 TYPE=wireless
 IP=172.16.1.186/30
@@ -80,5 +85,5 @@
 MODE=managed
 ESSID=il-no.hmkerk.wleiden.net
-#CHANNEL=13
+CHANNEL=13
 
 
Index: nodes/CNodeLMstruykverwo2/wleiden.conf
===================================================================
--- nodes/CNodeLMstruykverwo2/wleiden.conf	(revision 8260)
+++ nodes/CNodeLMstruykverwo2/wleiden.conf	(revision 8261)
@@ -20,5 +20,6 @@
 $AGGREGATE=22;
 
-$config{'sis0'}=sprintf <<ED0;  # ethernet poort 0 StruykVerwo2
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=ethernet poort 0 StruykVerwo2
 TYPE=ethernet
 IP=172.25.74.65/29
@@ -32,5 +33,6 @@
 ED0
 
-$config{'sis1'}=sprintf <<ED1;  # Ethernet naar LMStruykVerwo1
+$config{'sis1'}=sprintf <<ED1;
+COMMENT=Ethernet naar LMStruykVerwo1
 TYPE=ethernet
 IP=172.16.1.182/30
@@ -44,5 +46,6 @@
 ED1
 
-$config{'wi0'}=sprintf <<EW0;  # interlink struykverwo kaag 
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=interlink struykverwo kaag 
 TYPE=wireless
 IP=172.16.1.197/30
@@ -57,5 +60,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;  # Interlink kempers - struykverwo
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=Interlink kempers - struykverwo
 TYPE=wireless
 IP=172.16.1.206/30
@@ -65,5 +69,5 @@
 MODE=managed
 ESSID=il-zw.kmprs.wleiden.net
-#CHANNEL=1
+CHANNEL=1
 
 
Index: nodes/CNodeLUMC/wleiden.conf
===================================================================
--- nodes/CNodeLUMC/wleiden.conf	(revision 8260)
+++ nodes/CNodeLUMC/wleiden.conf	(revision 8261)
@@ -21,5 +21,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0; # a-link naar UniGor
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=a-link naar UniGor
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -28,12 +29,13 @@
 SDESC=2unigor
 DHCP=no
-#MODE=station
-#ESSID=il-Z0.unigor.wleiden.net
-#CHANNEL=128
-#NSMAC= 00:15:6D:70:54:C9
-#NSIP=172.16.4.83/29
+MODE=station
+ESSID=il-Z0.unigor.wleiden.net
+CHANNEL=128
+NSMAC= 00:15:6D:70:54:C9
+NSIP=172.16.4.83/29
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # a-link zuidoost
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=a-link zuidoost
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -42,12 +44,13 @@
 SDESC=2centrum
 DHCP=no
-#MODE=ap
-#ESSID=il-z.lumc.wleiden.net
-#CHANNEL=36
-#NSMAC=00:15:6D:70:53:6D
-#NSIP=172.16.4.98/29
+MODE=ap
+ESSID=il-z.lumc.wleiden.net
+CHANNEL=36
+NSMAC=00:15:6D:70:53:6D
+NSIP=172.16.4.98/29
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # a-link zuidwest
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=a-link zuidwest
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -56,12 +59,13 @@
 SDESC=2cam
 DHCP=no
-#MODE=ap
-#ESSID=il-zw.lumc.wleiden.net
-#CHANNEL=116
-#NSMAC=00:15:6D:BD:69:00
-#NSIP=172.16.4.106/29
+MODE=ap
+ESSID=il-zw.lumc.wleiden.net
+CHANNEL=116
+NSMAC=00:15:6D:BD:69:00
+NSIP=172.16.4.106/29
 VR2
 
-$config{'ue0'}=sprintf <<UE0;  # naar webcam
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=naar webcam
 TYPE=ethernet
 IP=172.16.3.21/30
Index: nodes/CNodeLangeVoort/wleiden.conf
===================================================================
--- nodes/CNodeLangeVoort/wleiden.conf	(revision 8260)
+++ nodes/CNodeLangeVoort/wleiden.conf	(revision 8261)
@@ -13,5 +13,6 @@
 $status='up';
 
-$config{'sis0'}=sprintf <<SIS0;  # eth
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=eth
 TYPE=ethernet
 IP=172.23.25.65/30
@@ -20,5 +21,6 @@
 SIS0
 
-$config{'wi0'}=sprintf <<EW0;  # Locale Omni
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=Locale Omni
 TYPE=wireless
 IP=$master_ip/26
@@ -31,5 +33,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;  # Link naar hofwijck
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=Link naar hofwijck
 TYPE=wireless
 IP=172.16.3.134/30
@@ -38,9 +41,10 @@
 MODE=managed
 ESSID=il-w.hofwijck.wleiden.net
-#CHANNEL=3
+CHANNEL=3
 DHCP=no
 EW1
 
-$config{'wi2'}=sprintf <<EW2;  # Link naar Lijtweg1
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=Link naar Lijtweg1
 TYPE=wireless
 IP=172.16.3.66/30
Index: nodes/CNodeLebkov/wleiden.conf
===================================================================
--- nodes/CNodeLebkov/wleiden.conf	(revision 8260)
+++ nodes/CNodeLebkov/wleiden.conf	(revision 8261)
@@ -20,5 +20,6 @@
 $LOKATIE='Bargelaan 8';
 
-$config{'sis0'}=sprintf <<ED0;  # Ethernet
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.19.152.65/26
@@ -29,5 +30,6 @@
 ED0
 
-$config{'wi1'}=sprintf <<EW1;  # Link naar RABO
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=Link naar RABO
 TYPE=wireless
 IP=172.16.1.18/30
@@ -42,5 +44,6 @@
 
 
-$config{'wi2'}=sprintf <<EW0;  # AP omni
+$config{'wi2'}=sprintf <<EW0;
+COMMENT=AP omni
 TYPE=wireless
 IP=$master_ip/26
@@ -55,5 +58,6 @@
 
 
-$config{'wi0'}=sprintf <<EW2;  # link naar Unigor
+$config{'wi0'}=sprintf <<EW2;
+COMMENT=link naar Unigor
 TYPE=wireless
 IP=172.16.1.14/30
Index: nodes/CNodeLeythenrode/wleiden.conf
===================================================================
--- nodes/CNodeLeythenrode/wleiden.conf	(revision 8260)
+++ nodes/CNodeLeythenrode/wleiden.conf	(revision 8261)
@@ -10,5 +10,34 @@
 $Y='463407';
 
-$config{'ath0'}=sprintf <<ATH0;  # Ap voor buurt
+$COMMENT=sprintf <<EOF;
+##configuration of local AP's
+##
+AP-1 zuidoost
+ESSID=ap-zo.leythenrode
+LAN_IP=172.17.0.3/24
+MODE=bridge
+CHANNEL=2
+##
+AP-2 zuidwest
+ESSID=ap-zw.leythenrode
+LAN_IP=172.17.0.4/24
+MODE=bridge
+CHANNEL=11
+#
+AP-3 noordwest
+ESSID=ap-nw.leythenrode
+LAN_IP=172.17.0.5/24
+MODE=bridge
+CHANNEL=5
+#
+AP-4 noordoost
+ESSID=ap-no.leythenrode
+LAN_IP=172.17.0.6/24
+MODE=bridge
+CHANNEL=8
+EOF
+
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=Ap voor buurt
 TYPE=wireless
 IP=$master_ip/26
@@ -21,5 +50,6 @@
 ATH0
 
-$config{'ue0'}=sprintf <<UE0;  # ethernet to local subnet with PoE
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=ethernet to local subnet with PoE
 IP=172.17.0.2/24
 DESC=local ethernet with proxy7 and local clients (ap's bridge)
@@ -29,31 +59,7 @@
 UE0
 
-#configuration of local AP's
-#
-#AP-1 zuidoost
-#ESSID=ap-zo.leythenrode
-#LAN_IP=172.17.0.3/24
-#MODE=bridge
-#CHANNEL=2
-#
-#AP-2 zuidwest
-#ESSID=ap-zw.leythenrode
-#LAN_IP=172.17.0.4/24
-#MODE=bridge
-#CHANNEL=11
 
-#AP-3 noordwest
-#ESSID=ap-nw.leythenrode
-#LAN_IP=172.17.0.5/24
-#MODE=bridge
-#CHANNEL=5
-
-#AP-4 noordoost
-#ESSID=ap-no.leythenrode
-#LAN_IP=172.17.0.6/24
-#MODE=bridge
-#CHANNEL=8
-
-$config{'vr0'}=sprintf <<VR0; # a-link naar AA24
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=a-link naar AA24
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -61,11 +67,12 @@
 DESC=Ethernet naar interlink zuidoost (AA24)
 SDESC=2AA24
-#MODE=master
-#ESSID=il-zo.leythenrode.wleiden.net
-#CHANNEL=100
-#NSMAC=00:15:6D:EB:F1:33
+MODE=master
+ESSID=il-zo.leythenrode.wleiden.net
+CHANNEL=100
+NSMAC=00:15:6D:EB:F1:33
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # a-link naar Graficall via Nanostation5
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=a-link naar Graficall via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -73,12 +80,13 @@
 DESC=Ethernet naar interlink noordoost (graficall)
 SDESC=2Graficall
-#MODE=master
-#ESSID=il-no.leythenrode.wleiden.net
-#CHANNEL=52
-#NSMAC=00:15:6D:BD:8A:06
-#NS_IP=192.168.1.20
+MODE=master
+ESSID=il-no.leythenrode.wleiden.net
+CHANNEL=52
+NSMAC=00:15:6D:BD:8A:06
+NS_IP=192.168.1.20
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # a-link to DeClercq via Nanostation5
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=a-link to DeClercq via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -86,10 +94,11 @@
 DESC=ethernet naar interlink zuidwest (DeClercq))
 SDESC=2DeClercq
-#MODE=master
-#ESSID=il-zw.leythenrode.wleiden.net
-#CHANNEL=44
+MODE=master
+ESSID=il-zw.leythenrode.wleiden.net
+CHANNEL=44
 VR2
 
-$config{'vr2:0'}=sprintf <<VR20; # temp. a-link to Roomburgh2 via Nanostation5
+$config{'vr2:0'}=sprintf <<VR20;
+COMMENT=temp. a-link to Roomburgh2 via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -97,7 +106,7 @@
 DESC=ethernet naar interlink zuidwest (Roomburgh2)
 SDESC=2Roomburgh2
-#MODE=master
-#ESSID=il-zw.leythenrode.wleiden.net
-#CHANNEL=44
+MODE=master
+ESSID=il-zw.leythenrode.wleiden.net
+CHANNEL=44
 VR20
 
Index: nodes/CNodeLijtweg1/wleiden.conf
===================================================================
--- nodes/CNodeLijtweg1/wleiden.conf	(revision 8260)
+++ nodes/CNodeLijtweg1/wleiden.conf	(revision 8261)
@@ -10,5 +10,6 @@
 $Y=466740;
 
-$config{'ath0'}=sprintf <<ATH0;  # ap noord
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap noord
 TYPE=wireless
 IP=$master_ip/26
@@ -21,5 +22,6 @@
 ATH0
 
-$config{'ue0'}=sprintf <<UE0; # link naar Lange Voort
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=link naar Lange Voort
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -28,12 +30,13 @@
 IP=172.16.3.65/30
 DHCP=no
-#MODE=ap
-#ESSID=il-o.lijtweg1.wleiden.net
-#CHANNEL=2
-#BulletIP=192.168.1.20
-#BulletMAC=
+MODE=ap
+ESSID=il-o.lijtweg1.wleiden.net
+CHANNEL=2
+BulletIP=192.168.1.20
+BulletMAC=
 UE0
 
-$config{'ue1'}=sprintf <<UE1;  # Ethernet naar Lijtweg2
+$config{'ue1'}=sprintf <<UE1;
+COMMENT=Ethernet naar Lijtweg2
 TYPE=ethernet
 IP=172.16.253.1/30
@@ -43,5 +46,6 @@
 UE1
 
-$config{'vr0'}=sprintf <<VR0; # Link naar Rene
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Link naar Rene
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -50,12 +54,13 @@
 SDESC=2rene
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-n.lijtweg1.wleiden.net
-#CHANNEL=108
-#NS_IP=192.168.1.20
-#NSMAC=
+MODE=bridge ap
+ESSID=il-n.lijtweg1.wleiden.net
+CHANNEL=108
+NS_IP=192.168.1.20
+NSMAC=
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # Link naar Hofwijck
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=Link naar Hofwijck
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -64,12 +69,13 @@
 SDESC=2hofwijck
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-o.lijtweg1.wleiden.net
-#CHANNEL=124
-#NS_IP=192.168.1.20
-#NSMAC=
+MODE=bridge ap
+ESSID=il-o.lijtweg1.wleiden.net
+CHANNEL=124
+NS_IP=192.168.1.20
+NSMAC=
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # Link naar Aster
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=Link naar Aster
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -78,9 +84,9 @@
 DESC=Link naar Aster
 SDESC=2aster
-#MODE=bridge ap
-#ESSID=il-w.lijtweg1.wleiden.net
-#CHANNEL=116
-#NS_IP=192.168.1.20
-#NSMAC=
+MODE=bridge ap
+ESSID=il-w.lijtweg1.wleiden.net
+CHANNEL=116
+NS_IP=192.168.1.20
+NSMAC=
 VR2
 
Index: nodes/CNodeLijtweg2/wleiden.conf
===================================================================
--- nodes/CNodeLijtweg2/wleiden.conf	(revision 8260)
+++ nodes/CNodeLijtweg2/wleiden.conf	(revision 8261)
@@ -10,5 +10,6 @@
 $Y='466702';
 
-$config{'ath0'}=sprintf <<ATH0;  # ap zuid
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap zuid
 TYPE=wireless
 IP=$master_ip/26
@@ -21,5 +22,6 @@
 ATH0
 
-$config{'ue0'}=sprintf <<UE0;  # Ethernet naar Lijtweg1
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=Ethernet naar Lijtweg1
 TYPE=ethernet
 IP=172.16.253.2/30
@@ -29,5 +31,6 @@
 UE0
 
-$config{'ue1'}=sprintf <<UE1;  # Link naar AZC
+$config{'ue1'}=sprintf <<UE1;
+COMMENT=Link naar AZC
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -36,12 +39,13 @@
 IP=172.16.1.98/30
 DHCP=no
-#MODE=bridge station
-#ESSID=il-n.azc.wleiden.net
-#CHANNEL=7
-#NS_IP=192.168.1.21
-#BulletMAC=
+MODE=bridge station
+ESSID=il-n.azc.wleiden.net
+CHANNEL=7
+NS_IP=192.168.1.21
+BulletMAC=
 UE1
 
-$config{'vr0'}=sprintf <<VR0; # Link naar Rustenborch
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Link naar Rustenborch
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -50,12 +54,13 @@
 SDESC=2rustenborch
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-w.lijtweg2.wleiden.net
-#CHANNEL=144
-#NS_IP=192.168.1.20
-#NSMAC=
+MODE=bridge ap
+ESSID=il-w.lijtweg2.wleiden.net
+CHANNEL=144
+NS_IP=192.168.1.20
+NSMAC=
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # Link naar Brug
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=Link naar Brug
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -64,12 +69,13 @@
 SDESC=2brug
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-z.lijtweg2.wleiden.net
-#CHANNEL=132
-#NS_IP=192.168.1.20
-#NSMAC=
+MODE=bridge ap
+ESSID=il-z.lijtweg2.wleiden.net
+CHANNEL=132
+NS_IP=192.168.1.20
+NSMAC=
 VR1
 
-$config{'vr1:0'}=sprintf <<VR10; # Link naar Camimplants
+$config{'vr1:0'}=sprintf <<VR10;
+COMMENT=Link naar Camimplants
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -80,5 +86,6 @@
 VR10
 
-$config{'vr2'}=sprintf <<VR2; # Link naar Broekplein
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=Link naar Broekplein
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -87,9 +94,9 @@
 SDESC=2broekplein
 DHCP=no
-#MODE=bridge station
-#ESSID=il-w.broekplein.wleiden.net
-#CHANNEL=44
-#NS_IP=192.168.1.21
-#NSMAC=
+MODE=bridge station
+ESSID=il-w.broekplein.wleiden.net
+CHANNEL=44
+NS_IP=192.168.1.21
+NSMAC=
 VR2
 
Index: nodes/CNodeLivingLab/wleiden.conf
===================================================================
--- nodes/CNodeLivingLab/wleiden.conf	(revision 8260)
+++ nodes/CNodeLivingLab/wleiden.conf	(revision 8261)
@@ -119,5 +119,6 @@
 SIS3
 
-$config{'ath0'}=sprintf <<ATH0;  # Ap voor buurt
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=Ap voor buurt
 TYPE=wireless
 IP=$master_ip/26
Index: nodes/CNodeLorentzhof/wleiden.conf
===================================================================
--- nodes/CNodeLorentzhof/wleiden.conf	(revision 8260)
+++ nodes/CNodeLorentzhof/wleiden.conf	(revision 8261)
@@ -20,5 +20,6 @@
 $LOKATIE='Lorentzhof 1, 2313 GA,  Leiden';
 
-$config{'sis0'}=sprintf <<ED0;  # Ethernet
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.18.64.65/28
@@ -34,5 +35,6 @@
 
 
-$config{'wi0'}=sprintf <<EW0;  # omni
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=omni
 TYPE=wireless
 IP=$master_ip/26
@@ -62,9 +64,10 @@
 HEIGHT=13
 DHCP=no
-#CHANNEL 2
+CHANNEL 2
 EW1
 
 
-$config{'wi2'}=sprintf <<EW2; #Link naar Plantsoen
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=Link naar Plantsoen
 TYPE=wireless
 IP=172.16.1.225/30
@@ -82,5 +85,6 @@
 EW2
 
-$config{'wi3'}=sprintf <<EW3; #Link Haagwijk
+$config{'wi3'}=sprintf <<EW3;
+COMMENT=Link Haagwijk
 
 TYPE=wireless
@@ -93,5 +97,5 @@
 ESSID=il-o.haagwijk.wleiden.net
 
-#CHANNEL=1
+CHANNEL=1
 
 HEIGHT=13
Index: nodes/CNodeLvLn/wleiden.conf
===================================================================
--- nodes/CNodeLvLn/wleiden.conf	(revision 8260)
+++ nodes/CNodeLvLn/wleiden.conf	(revision 8261)
@@ -18,5 +18,6 @@
 $Y='464130';
 
-$config{'ep0'}=sprintf <<ED0;  # eth
+$config{'ep0'}=sprintf <<ED0;
+COMMENT=eth
 TYPE=ethernet
 IP=172.17.144.65/29
@@ -29,5 +30,6 @@
 
 
-$config{'ep0:0'}=sprintf <<ED00;  # link naar lvln2 via ethernet
+$config{'ep0:0'}=sprintf <<ED00;
+COMMENT=link naar lvln2 via ethernet
 TYPE=ethernet
 IP=172.16.0.25/30
@@ -38,5 +40,6 @@
 
 
-$config{'wi0'}=sprintf <<EW0;  # OMNI
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=OMNI
 TYPE=wireless
 IP=$master_ip/26
@@ -53,5 +56,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;  # link naar cope
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=link naar cope
 TYPE=wireless
 IP=172.16.0.70/30
@@ -68,5 +72,6 @@
 EW1
 
-$config{'wi2'}=sprintf <<EW2;  # link naar CeTIM (HLK)
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=link naar CeTIM (HLK)
 TYPE=wireless
 IP=172.16.0.74/30
Index: nodes/CNodeLvLn2/wleiden.conf
===================================================================
--- nodes/CNodeLvLn2/wleiden.conf	(revision 8260)
+++ nodes/CNodeLvLn2/wleiden.conf	(revision 8261)
@@ -18,5 +18,6 @@
 $Y='464130';
 
-$config{'sis0'}=sprintf <<ED0;  # eth
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=eth
 TYPE=ethernet
 IP=172.17.144.66/29
@@ -30,5 +31,6 @@
 
 
-$config{'sis0:0'}=sprintf <<ED00;  # link naar lvln via ethernet
+$config{'sis0:0'}=sprintf <<ED00;
+COMMENT=link naar lvln via ethernet
 TYPE=ethernet
 SDESC=2lvln
@@ -39,5 +41,6 @@
 
 
-$config{'ath0'}=sprintf <<EW0;  # alink 2 stadhuis2
+$config{'ath0'}=sprintf <<EW0;
+COMMENT=alink 2 stadhuis2
 TYPE=wireless
 SUBTYPE=802.11a
@@ -56,5 +59,6 @@
 EW0
 
-$config{'ath1'}=sprintf <<EW1;  # link naar rabo
+$config{'ath1'}=sprintf <<EW1;
+COMMENT=link naar rabo
 TYPE=wireless
 IP=172.16.0.98/30
Index: nodes/CNodeLvLz/wleiden.conf
===================================================================
--- nodes/CNodeLvLz/wleiden.conf	(revision 8260)
+++ nodes/CNodeLvLz/wleiden.conf	(revision 8261)
@@ -19,5 +19,6 @@
 $Y='463350';
 
-$config{'ep0'}=sprintf <<ED0;  # eth
+$config{'ep0'}=sprintf <<ED0;
+COMMENT=eth
 TYPE=ethernet
 IP=172.17.40.65/29
@@ -42,5 +43,5 @@
 MODE=managed
 ESSID=il-no.imi.wleiden.net
-#CHANNEL=11
+CHANNEL=11
 
 
@@ -57,5 +58,5 @@
 MODE=managed
 ESSID=il-zw.cetim2.wleiden.net
-#CHANNEL=1
+CHANNEL=1
 
 
Index: nodes/CNodeMuiderkring/wleiden.conf
===================================================================
--- nodes/CNodeMuiderkring/wleiden.conf	(revision 8260)
+++ nodes/CNodeMuiderkring/wleiden.conf	(revision 8261)
@@ -12,5 +12,6 @@
 $status='up';
 
-$config{'ath0'}=sprintf <<ATH0;  # Lokaal accesspoint
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=Lokaal accesspoint
 TYPE=wireless
 IP=$master_ip/26
@@ -23,5 +24,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # eth
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=eth
 TYPE=ethernet
 IP=172.16.3.145/30
@@ -31,5 +33,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # Link naar AJSoft
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=Link naar AJSoft
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -37,9 +40,9 @@
 DESC=Link naar AJSoft
 SDESC=2ajsoft
-#MODE=managed
-#ESSID=il-nno.ajsoft2.wleiden.net
-#CHANNEL=1
+MODE=managed
+ESSID=il-nno.ajsoft2.wleiden.net
+CHANNEL=1
 DHCP=no
-#BulletMAC=00:15:6D:E8:E6:B1
-#BulletIP=192.168.1.21
+BulletMAC=00:15:6D:E8:E6:B1
+BulletIP=192.168.1.21
 VR1
Index: nodes/CNodeOBLc/wleiden.conf
===================================================================
--- nodes/CNodeOBLc/wleiden.conf	(revision 8260)
+++ nodes/CNodeOBLc/wleiden.conf	(revision 8261)
@@ -18,5 +18,6 @@
 $Y='463741';
 
-$config{'xl0'}=sprintf <<XL0;  # Ethernet
+$config{'xl0'}=sprintf <<XL0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.17.152.65/27
@@ -31,5 +32,6 @@
 XL0
 
-$config{'ep0'}=sprintf <<EP0;  # Ethernet
+$config{'ep0'}=sprintf <<EP0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=$master_ip/24
@@ -46,5 +48,6 @@
 
 
-$config{'wi0'}=sprintf <<EW1;  # link naar CeTIM3
+$config{'wi0'}=sprintf <<EW1;
+COMMENT=link naar CeTIM3
 TYPE=wireless
 IP=172.16.0.162/30
Index: nodes/CNodePPFortis/wleiden.conf
===================================================================
--- nodes/CNodePPFortis/wleiden.conf	(revision 8260)
+++ nodes/CNodePPFortis/wleiden.conf	(revision 8261)
@@ -20,5 +20,6 @@
 #$AGGREGATE=22;
 
-$config{'sis0'}=sprintf <<SIS0;  # Ethernet IP's 65 - 70 /248
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=Ethernet IP's 65 - 70 /248
 TYPE=ethernet
 IP=172.28.138.65/29
@@ -33,18 +34,19 @@
 
 
-#$config{'sis1'}=sprintf <<SIS1;  # Ethernet
-#TYPE=ethernet
-#IP=172.28.138.73/29
-#
-#DESC=Ethernet naar ......
-#SDESC=eth
-#
-#DHCP=no
-#
-#
-#SIS1
+$config{'sis1'}=sprintf <<SIS1;
+TYPE=ethernet
+IP=172.28.138.73/29
+
+DESC=Ethernet naar onbekend
+SDESC=eth
+
+DHCP=no
 
 
-$config{'wi0'}=sprintf <<EW0;  # OMNI
+SIS1
+
+
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=OMNI
 TYPE=wireless
 IP=$master_ip/26
@@ -65,5 +67,6 @@
 
 
-$config{'wi1'}=sprintf <<EW1;  # Planned interlink Richting Leiden
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=Planned interlink Richting Leiden
 TYPE=wireless
 IP=172.16.28.1/30
@@ -83,5 +86,6 @@
 
 
-$config{'wi2'}=sprintf <<EW2;  # interlink naar Stadhuis
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=interlink naar Stadhuis
 TYPE=wireless
 IP=172.28.1.137/30
Index: nodes/CNodePlantsoen2/wleiden.conf
===================================================================
--- nodes/CNodePlantsoen2/wleiden.conf	(revision 8260)
+++ nodes/CNodePlantsoen2/wleiden.conf	(revision 8261)
@@ -17,5 +17,6 @@
 
 
-$config{'ath0'}=sprintf <<ATH0;  # AP voor buurt
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=AP voor buurt
 TYPE=wireless
 IP=$master_ip/26
@@ -28,5 +29,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # Lokaal ethernet met PoE
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Lokaal ethernet met PoE
 TYPE=ethernet
 IP=172.17.169.65/28
@@ -37,5 +39,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # a-link to Stadhuis via Nanostation5
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=a-link to Stadhuis via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -46,5 +49,6 @@
 VR1
 
-$config{'vr1:0'}=sprintf <<VR10; # ethernet to nanostation mgmt interface
+$config{'vr1:0'}=sprintf <<VR10;
+COMMENT=ethernet to nanostation mgmt interface
 TYPE=ethernet
 IP=172.16.3.189/30
@@ -52,11 +56,12 @@
 SDESC=manageNS5
 DHCP=no
-#MODE=managed
-#ESSID=il-zo.stadhuis.wleiden.net
-#CHANNEL=44
-#DISTANCE=0.5 km
+MODE=managed
+ESSID=il-zo.stadhuis.wleiden.net
+CHANNEL=44
+DISTANCE=0.5 km
 VR10
 
-$config{'vr2'}=sprintf <<VR2; # a-link to Vosko via Nanostation2
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=a-link to Vosko via Nanostation2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -67,5 +72,6 @@
 VR2
 
-$config{'vr2:0'}=sprintf <<VR20; # to Nanostation2 management interface
+$config{'vr2:0'}=sprintf <<VR20;
+COMMENT=to Nanostation2 management interface
 TYPE=ethernet
 IP=172.16.3.193/30
@@ -73,7 +79,7 @@
 SDESC=manageNS2
 DHCP=no
-#MODE=managed
-#ESSID=il-zo.vosko3.wleiden.net
-#CHANNEL=
-#DISTANCE=0.7 km
+MODE=managed
+ESSID=il-zo.vosko3.wleiden.net
+CHANNEL=
+DISTANCE=0.7 km
 VR20
Index: nodes/CNodeROCl/wleiden.conf
===================================================================
--- nodes/CNodeROCl/wleiden.conf	(revision 8260)
+++ nodes/CNodeROCl/wleiden.conf	(revision 8261)
@@ -18,5 +18,6 @@
 $Y='462243';
 
-$config{'ep0'}=sprintf <<ED0;  # Ethernet
+$config{'ep0'}=sprintf <<ED0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.21.1.65/28
@@ -32,5 +33,6 @@
 
 
-$config{'wi0'}=sprintf <<EW0;  # omni
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=omni
 TYPE=wireless
 IP=$master_ip/26
@@ -49,5 +51,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;  # link naar Marten
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=link naar Marten
 TYPE=wireless
 IP=172.16.0.157/30
@@ -67,5 +70,6 @@
 
 
-$config{'wi1:0'}=sprintf <<EW10;  # link naar JVC
+$config{'wi1:0'}=sprintf <<EW10;
+COMMENT=link naar JVC
 TYPE=wireless
 IP=172.16.0.233/30
@@ -88,5 +92,6 @@
 EW11
 
-$config{'wi2'}=sprintf <<EW2;  # link naar Grip
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=link naar Grip
 TYPE=wireless
 IP=172.16.0.253/30
@@ -106,5 +111,6 @@
 
 
-$config{'wi2:0'}=sprintf <<EW20;  # link naar Jasper
+$config{'wi2:0'}=sprintf <<EW20;
+COMMENT=link naar Jasper
 TYPE=wireless
 IP=172.16.0.153/30
@@ -117,17 +123,19 @@
 
 
-#$config{'wi2:1'}=sprintf <<EW21;  # link naar Zijloever
-#TYPE=wireless
-#IP=172.16.1.65/30
-#DESC=Link naar Zijloever
-#SDESC=2zijloever
+$config{'wi2:1'}=sprintf <<EW21;  
+COMMENT=link naar Zijloever
+TYPE=wireless
+IP=172.16.1.65/30
+DESC=Link naar Zijloever
+SDESC=2zijloever
 #
 #
-#DHCP=no
+DHCP=no
 #
-#EW21
+EW21
 
 
-$config{'wi3'}=sprintf <<EW3; # link naar haagwijk
+$config{'wi3'}=sprintf <<EW3;
+COMMENT=link naar haagwijk
 TYPE=wireless
 IP=172.16.3.90/30
@@ -139,5 +147,5 @@
 ESSID=il-z.haagwijk.wleiden.net
 
-#CHANNEL=11
+CHANNEL=11
 
 
Index: nodes/CNodeRV/wleiden.conf
===================================================================
--- nodes/CNodeRV/wleiden.conf	(revision 8260)
+++ nodes/CNodeRV/wleiden.conf	(revision 8261)
@@ -10,5 +10,6 @@
 $Y='462819';
 
-$config{'ath0'}=sprintf <<ATH0;  # ap 
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap 
 TYPE=wireless
 IP=$master_ip/26
@@ -21,5 +22,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # b-link naar ajsoft 
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=b-link naar ajsoft 
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -27,13 +29,14 @@
 DESC=Link naar ajsoft
 SDESC=b2ajsoft
-#MODE=master
-#ESSID=il-zw.rv.wleiden.net
-#CHANNEL=4
+MODE=master
+ESSID=il-zw.rv.wleiden.net
+CHANNEL=4
 DHCP=no
-#BulletMAC=00:15:6D:E9:F9:B0
-#BulletIP=192.168.1.20
+BulletMAC=00:15:6D:E9:F9:B0
+BulletIP=192.168.1.20
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # link naar IMI
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=link naar IMI
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -42,11 +45,12 @@
 DESC=Link naar IMI
 SDESC=2imi
-#MODE=bridge ap
-#ESSID=il-no.rv.wleiden.net
-#CHANNEL=60
-#NSMAC=00:15:6D:ED:82:7C
+MODE=bridge ap
+ESSID=il-no.rv.wleiden.net
+CHANNEL=60
+NSMAC=00:15:6D:ED:82:7C
 VR1
 
-$config{'vr2'}=sprintf <<VR2;  # a-link naar AJSoft
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=a-link naar AJSoft
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -55,12 +59,13 @@
 DESC=a-Link naar AJSoft
 SDESC=a2ajsoft
-#MODE=managed
-#ESSID=il-o.ajsoft2.wleiden.net
-#CHANNEL=
-#NSMAC=00:15:6D:EC:82:40
-#NS_IP=192.168.1.21
+MODE=managed
+ESSID=il-o.ajsoft2.wleiden.net
+CHANNEL=
+NSMAC=00:15:6D:EC:82:40
+NS_IP=192.168.1.21
 VR2
 
-$config{'ue0'}=sprintf <<UE0;  # Ethernet
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.20.128.65/27
@@ -70,5 +75,6 @@
 UE0
 
-$config{'ue1'}=sprintf <<UE1;  # Ethernet naar proxy
+$config{'ue1'}=sprintf <<UE1;
+COMMENT=Ethernet naar proxy
 TYPE=ethernet
 IP=172.20.128.97/29
Index: nodes/CNodeRWgemhuis1/wleiden.conf
===================================================================
--- nodes/CNodeRWgemhuis1/wleiden.conf	(revision 8260)
+++ nodes/CNodeRWgemhuis1/wleiden.conf	(revision 8261)
@@ -17,5 +17,6 @@
 $LOCATION='Gemeentehuis Jacobswoude Rijnsaterwoude';
 
-$config{'sis0'}=sprintf <<ED0;  # ethernet poort 0
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=ethernet poort 0
 TYPE=ethernet
 IP=172.25.30.65/29
@@ -27,5 +28,6 @@
 ED0
 
-$config{'sis1'}=sprintf <<ED1;  # Link tussen eth 1 RWgemhuis2 en 1
+$config{'sis1'}=sprintf <<ED1;
+COMMENT=Link tussen eth 1 RWgemhuis2 en 1
 TYPE=ethernet
 IP=172.16.1.241/30
@@ -37,5 +39,6 @@
 ED1
 
-$config{'wi0'}=sprintf <<EW0;  # OMNI voor de buurt
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=OMNI voor de buurt
 TYPE=wireless
 IP=$master_ip/26
@@ -52,18 +55,19 @@
 EW0
 
-#$config{'wi1'}=sprintf <<EW1;  # link naar Bilderdam
-#TYPE=wireless
-#IP=172.16.2.5/30
-#DESC=Link naar Bilderdam
-#SDESC=2BDboon
+$config{'wi1'}=sprintf <<EW1; 
+COMMENT=link naar Bilderdam
+TYPE=wireless
+IP=172.16.2.5/30
+DESC=Link naar Bilderdam
+SDESC=2BDboon
 #
-#MODE=master
-#ESSID=il-no.rwgemhuis.wleiden.net
-#CHANNEL=13
+MODE=master
+ESSID=il-no.rwgemhuis.wleiden.net
+CHANNEL=13
 #
 #
-#DHCP=no
+DHCP=no
 #
-#EW1
+EW1
 
 
Index: nodes/CNodeRWgemhuis2/wleiden.conf
===================================================================
--- nodes/CNodeRWgemhuis2/wleiden.conf	(revision 8260)
+++ nodes/CNodeRWgemhuis2/wleiden.conf	(revision 8261)
@@ -18,5 +18,6 @@
 $LOCATION='Gemeentehuis Jacobswoude Rijnsaterwoude';
 
-$config{'sis0'}=sprintf <<ED0;  # ethernet poort 0 Soekris
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=ethernet poort 0 Soekris
 TYPE=ethernet
 IP=172.25.34.65/29
@@ -29,5 +30,6 @@
 ED0
 
-$config{'sis1'}=sprintf <<ED1;  # Link tussen eth 1 RWgemhuis1 en 2.
+$config{'sis1'}=sprintf <<ED1;
+COMMENT=Link tussen eth 1 RWgemhuis1 en 2.
 TYPE=ethernet
 IP=172.16.1.242/30
@@ -40,5 +42,6 @@
 ED1
 
-$config{'wi0'}=sprintf <<EW0;  # link naar Node Struyk Verwo
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=link naar Node Struyk Verwo
 TYPE=wireless
 IP=172.16.1.53/30 
@@ -55,5 +58,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;  # link naar Node WB rotary 
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=link naar Node WB rotary 
 TYPE=wireless
 IP=172.16.2.26/30
@@ -63,5 +67,5 @@
 MODE=client
 ESSID=il-no.wbrotary.wleiden.net
-#CHANNEL=9
+CHANNEL=9
 
 
Index: nodes/CNodeRabo1/wleiden.conf
===================================================================
--- nodes/CNodeRabo1/wleiden.conf	(revision 8260)
+++ nodes/CNodeRabo1/wleiden.conf	(revision 8261)
@@ -10,5 +10,6 @@
 $Y='464974';
 
-$config{'ath0'}=sprintf <<ATH0;  # ap oost
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap oost
 TYPE=wireless
 IP=$master_ip/26
@@ -21,5 +22,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # Ethernet naar Rabo2
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Ethernet naar Rabo2
 IP=172.19.137.65/30
 DHCP=no
@@ -28,5 +30,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # a-link naar NodeHuub
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=a-link naar NodeHuub
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -36,12 +39,13 @@
 SDESC=2huub
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-z.rabo1.wleiden.net
-#CHANNEL=44
-#NSIP=172.16.4.10/29
-#NSMAC= 00:15:6D:70:53:6A
+MODE=bridge ap
+ESSID=il-z.rabo1.wleiden.net
+CHANNEL=44
+NSIP=172.16.4.10/29
+NSMAC= 00:15:6D:70:53:6A
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # Link naar SOM
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=Link naar SOM
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -50,12 +54,13 @@
 SDESC=2som
 DHCP=no
-#MODE=bridge station
-#ESSID=il-w.som2.wleiden.net
-#CHANNEL=140
-#NS_IP=192.168.1.21
-#NSMAC=
+MODE=bridge station
+ESSID=il-w.som2.wleiden.net
+CHANNEL=140
+NS_IP=192.168.1.21
+NSMAC=
 VR2
 
-$config{'ue0'}=sprintf <<UE0;  # Link naar AZC
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=Link naar AZC
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -64,12 +69,13 @@
 SDESC=2azc
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-w.rabo1.wleiden.net
-#CHANNEL=5
-#Bullet_IP=192.168.1.20
-#BulletMAC=00:15:6D:
+MODE=bridge ap
+ESSID=il-w.rabo1.wleiden.net
+CHANNEL=5
+Bullet_IP=192.168.1.20
+BulletMAC=00:15:6D:
 UE0
 
-$config{'ue0:0'}=sprintf <<UE00;  # link naar Lebkov
+$config{'ue0:0'}=sprintf <<UE00;
+COMMENT=link naar Lebkov
 TYPE=wireless
 IP=172.16.1.17/30
@@ -79,5 +85,6 @@
 UE00
 
-$config{'ue1'}=sprintf <<UE1;  # Link naar Rudi
+$config{'ue1'}=sprintf <<UE1;
+COMMENT=Link naar Rudi
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -86,9 +93,9 @@
 SDESC=2rudi
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-n.rabo1.wleiden.net
-#CHANNEL=13
-#Bullet_IP=192.168.1.20
-#BulletMAC=00:15:6D:
+MODE=bridge ap
+ESSID=il-n.rabo1.wleiden.net
+CHANNEL=13
+Bullet_IP=192.168.1.20
+BulletMAC=00:15:6D:
 UE1
 
Index: nodes/CNodeRabo2/wleiden.conf
===================================================================
--- nodes/CNodeRabo2/wleiden.conf	(revision 8260)
+++ nodes/CNodeRabo2/wleiden.conf	(revision 8261)
@@ -10,5 +10,6 @@
 $Y='464974';
 
-$config{'ath0'}=sprintf <<ATH0;  # ap zuid
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap zuid
 TYPE=wireless
 IP=$master_ip/26
@@ -21,5 +22,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # Ethernet naar Rabo1
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Ethernet naar Rabo1
 IP=172.19.137.66/30
 DHCP=no
@@ -28,5 +30,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # link naar NodeCope
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=link naar NodeCope
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -36,12 +39,13 @@
 SDESC=2cope
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-z.rabo2.wleiden.net
-#CHANNEL=132
-#NS_IP=192.168.1.20
-#NSMAC=
+MODE=bridge ap
+ESSID=il-z.rabo2.wleiden.net
+CHANNEL=132
+NS_IP=192.168.1.20
+NSMAC=
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # Link naar DirkLos2
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=Link naar DirkLos2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -50,8 +54,8 @@
 SDESC=2dirklos2
 DHCP=no
-#MODE=bridge station
-#ESSID=il-no.dirklos2.wleiden.net
-#CHANNEL=140
-#NS_IP=192.168.1.21
-#NSMAC=
+MODE=bridge station
+ESSID=il-no.dirklos2.wleiden.net
+CHANNEL=140
+NS_IP=192.168.1.21
+NSMAC=
 VR2
Index: nodes/CNodeRegenboog/wleiden.conf
===================================================================
--- nodes/CNodeRegenboog/wleiden.conf	(revision 8260)
+++ nodes/CNodeRegenboog/wleiden.conf	(revision 8261)
@@ -11,5 +11,6 @@
 $Y='465975';
 
-$config{'ath0'}=sprintf <<ATH0;  # AP
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=AP
 TYPE=wireless
 IP=$master_ip/26
@@ -22,5 +23,6 @@
 ATH0
 
-$config{'sis0'}=sprintf <<SIS0;  # Ethernet
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.21.152.65/28
@@ -30,5 +32,6 @@
 SIS0
 
-$config{'sis1'}=sprintf <<SIS1; # Link naar Rosmolen
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=Link naar Rosmolen
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -37,11 +40,12 @@
 IP=172.16.2.66/30
 DHCP=no
-#MODE=managed
-#ESSID=il-o.rosmolen.wleiden.net
-#CHANNEL=11
-#BulletMAC=
+MODE=managed
+ESSID=il-o.rosmolen.wleiden.net
+CHANNEL=11
+BulletMAC=
 SIS1
 
-$config{'wi0'}=sprintf <<EW0;  # link naar oost -> Polder
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=link naar oost -> Polder
 TYPE=wireless
 DESC=Link naar oost
Index: nodes/CNodeRichard/wleiden.conf
===================================================================
--- nodes/CNodeRichard/wleiden.conf	(revision 8260)
+++ nodes/CNodeRichard/wleiden.conf	(revision 8261)
@@ -14,5 +14,6 @@
 $Y='453165';
 
-$config{'sis0'}=sprintf <<SIS0;  # Local ethernet to proxy
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=Local ethernet to proxy
 TYPE=ethernet
 IP=$master_ip/30
@@ -22,5 +23,6 @@
 SIS0
 
-$config{'wi0'}=sprintf <<WI0;  # Local ethernet to proxy
+$config{'wi0'}=sprintf <<WI0;
+COMMENT=Local ethernet to proxy
 TYPE=wireless
 IP=172.17.0.17/26
Index: nodes/CNodeRick/wleiden.conf
===================================================================
--- nodes/CNodeRick/wleiden.conf	(revision 8260)
+++ nodes/CNodeRick/wleiden.conf	(revision 8261)
@@ -13,5 +13,6 @@
 $Y='461987';
 
-$config{'sis0'}=sprintf <<SIS0; # Link to proxy interface 
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=Link to proxy interface 
 TYPE=ethernet
 IP=172.16.3.97/30
@@ -22,5 +23,6 @@
 
 
-$config{'ath0'}=sprintf <<ATH0;  # Internal Wireless
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=Internal Wireless
 TYPE=wireless
 MODE=master
@@ -39,5 +41,6 @@
 # Connected via NanoStation5
 # ESSID=il-zw.haagwijk.wleiden.net
-$config{'sis1'}=sprintf <<SIS1;  # Link naar Haagwijk
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=Link naar Haagwijk
 TYPE=ethernet
 IP=172.16.4.148/29
@@ -45,8 +48,8 @@
 DESC=Link naar Haagwijk
 SDESC=2haagwijk
-#MODE=bridge client wds
-#ESSID=il-zw.haagwijk.wleiden.net
-#NSMAC=
-#NS_IP=172.16.4.147/29
+MODE=bridge client wds
+ESSID=il-zw.haagwijk.wleiden.net
+NSMAC=
+NS_IP=172.16.4.147/29
 
 MODE=managed
Index: nodes/CNodeRobijn/wleiden.conf
===================================================================
--- nodes/CNodeRobijn/wleiden.conf	(revision 8260)
+++ nodes/CNodeRobijn/wleiden.conf	(revision 8261)
@@ -10,5 +10,6 @@
 $Y='463333';
 
-$config{'ue0'}=sprintf <<UE0;  # Ethernet
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.20.8.65/28
@@ -18,5 +19,6 @@
 UE0
 
-$config{'ath0'}=sprintf <<ATH0;  # omni
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=omni
 TYPE=wireless
 IP=$master_ip/26
@@ -29,5 +31,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # A link naar Vosko via nanostation
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=A link naar Vosko via nanostation
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -36,11 +39,12 @@
 SDESC=2vosko
 DHCP=no
-#MODE=managed
-#ESSID=il-w.vosko.wleiden.net
-#NS_IP=172.16.4.115/29
-#NSMAC=00:15:6D:F2:39:37
+MODE=managed
+ESSID=il-w.vosko.wleiden.net
+NS_IP=172.16.4.115/29
+NSMAC=00:15:6D:F2:39:37
 VR0
 
-$config{'vr1'}=sprintf <<VR1;   # A Link naar Unigor via nanostation
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=A Link naar Unigor via nanostation
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -49,11 +53,12 @@
 SDESC=2unigorA
 DHCP=no
-#NS_IP=192.168.1.21
-#NSMAC=00:15:6D:F2:39:44
-#MODE=managed
-#ESSID=ilA-z.unigor.wleiden.net
+NS_IP=192.168.1.21
+NSMAC=00:15:6D:F2:39:44
+MODE=managed
+ESSID=ilA-z.unigor.wleiden.net
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # A Link naar AJSoft via nanostation   
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=A Link naar AJSoft via nanostation   
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -62,8 +67,8 @@
 SDESC=2ajsoft
 DHCP=no
-#MODE=managed
-#ESSID=il-nw.ajsoft1.wleiden.net
-#NS_IP=192.168.1.21
-#NSMAC=00:15:6D:F2:38:07
+MODE=managed
+ESSID=il-nw.ajsoft1.wleiden.net
+NS_IP=192.168.1.21
+NSMAC=00:15:6D:F2:38:07
 VR2
 
Index: nodes/CNodeRoomburgh1/wleiden.conf
===================================================================
--- nodes/CNodeRoomburgh1/wleiden.conf	(revision 8260)
+++ nodes/CNodeRoomburgh1/wleiden.conf	(revision 8261)
@@ -11,5 +11,6 @@
 $Y='462890';
 
-$config{'ath0'}=sprintf <<ATH0;  # ap noordzijde
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap noordzijde
 TYPE=wireless
 IP=$master_ip/26
@@ -22,5 +23,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0; #link naar ROC
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=link naar ROC
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -30,12 +32,13 @@
 SDESC=2
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-wzw.roomburgh2.wleiden.net
-#CHANNEL=100
-#NS_IP=192.168.1.20
-#NSMAC=00:15:6D:EA:F0:38
+MODE=bridge ap
+ESSID=il-wzw.roomburgh2.wleiden.net
+CHANNEL=100
+NS_IP=192.168.1.20
+NSMAC=00:15:6D:EA:F0:38
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # link naar Cetim1
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=link naar Cetim1
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -44,12 +47,13 @@
 SDESC=2cetim1
 DHCP=no
-#MODE=managed
-#ESSID=il-zo.cetim1.wleiden.net
-#CHANNEL=132
-#NS_IP=192.168.1.21
-#NSMAC=00:15:6D:EA:EF:87
+MODE=managed
+ESSID=il-zo.cetim1.wleiden.net
+CHANNEL=132
+NS_IP=192.168.1.21
+NSMAC=00:15:6D:EA:EF:87
 VR1
 
-$config{'vr2'}=sprintf <<VR2; #link naar Rosmolen
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=link naar Rosmolen
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -58,11 +62,12 @@
 IP=172.16.3.73/29
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-nnw.roomburgh1.wleiden.net
-#CHANNEL=124
+MODE=bridge ap
+ESSID=il-nnw.roomburgh1.wleiden.net
+CHANNEL=124
 
 VR2
 
-$config{'ue0'}=sprintf <<UE0;  # Ethernet lokaal en Roomburgh2,3
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=Ethernet lokaal en Roomburgh2,3
 TYPE=ethernet
 IP=172.18.49.71/28
Index: nodes/CNodeRoomburgh2/wleiden.conf
===================================================================
--- nodes/CNodeRoomburgh2/wleiden.conf	(revision 8260)
+++ nodes/CNodeRoomburgh2/wleiden.conf	(revision 8261)
@@ -8,5 +8,6 @@
 $Y='462905';
 
-$config{'ath0'}=sprintf <<ATH0;  # ap zuidzijde
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap zuidzijde
 TYPE=wireless
 IP=$master_ip/26
@@ -19,5 +20,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # Ethernet to local subnet
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Ethernet to local subnet
 TYPE=ethernet
 IP=172.18.49.72/28
@@ -27,5 +29,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # tijdelijke link naar Leythenrode
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=tijdelijke link naar Leythenrode
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -34,12 +37,13 @@
 SDESC=2leythenrode
 DHCP=no
-#MODE=bridge managed
-#ESSID=il-zw.leythenrode.wleiden.net
-#CHANNEL=44
-#NS_IP=192.168.1.21
-#NSMAC=00:15:6D:EA:F0:7B
+MODE=bridge managed
+ESSID=il-zw.leythenrode.wleiden.net
+CHANNEL=44
+NS_IP=192.168.1.21
+NSMAC=00:15:6D:EA:F0:7B
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # link naar Lorentzhof
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=link naar Lorentzhof
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -47,9 +51,9 @@
 DESC=Link naar Lorentzhof
 SDESC=2lorentzhof
-#MODE=bridge ap
-#ESSID=il-zw.roomburgh2.wleiden.net
-#CHANNEL=116
-#NS_IP=192.168.1.20
-#NSMAC=00:15:6D:EB:EF:A7
+MODE=bridge ap
+ESSID=il-zw.roomburgh2.wleiden.net
+CHANNEL=116
+NS_IP=192.168.1.20
+NSMAC=00:15:6D:EB:EF:A7
 DHCP=no
 VR2
Index: nodes/CNodeRoomburgh3/wleiden.conf
===================================================================
--- nodes/CNodeRoomburgh3/wleiden.conf	(revision 8260)
+++ nodes/CNodeRoomburgh3/wleiden.conf	(revision 8261)
@@ -11,5 +11,6 @@
 $Y='462890';
 
-$config{'ath0'}=sprintf <<AT0;  # link naar ...
+$config{'ath0'}=sprintf <<AT0;
+COMMENT=link naar ...
 TYPE=wireless
 IP=172.16.3.161/30
@@ -22,5 +23,6 @@
 AT0
 
-$config{'vr0'}=sprintf <<VR0;  # Ethernet to local subnet with PoE
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Ethernet to local subnet with PoE
 TYPE=ethernet
 IP=172.18.49.73/28
@@ -30,5 +32,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # a-link to DeClerq via Nanostation5
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=a-link to DeClerq via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -37,12 +40,13 @@
 SDESC=2DeClerq
 DHCP=no
-#MODE=managed
-#ESSID=il-w.declercq.wleiden.net
-#CHANNEL=52
-#NS_IP=192.168.1.21
-#NSMAC=00:15:6D:BD:69:30
+MODE=managed
+ESSID=il-w.declercq.wleiden.net
+CHANNEL=52
+NS_IP=192.168.1.21
+NSMAC=00:15:6D:BD:69:30
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # link to Zijloever via Nanostation5
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=link to Zijloever via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -50,9 +54,9 @@
 DESC=ethernet to interlink noord-2
 SDESC=2Zijloever
-#MODE=master
-#ESSID=il-n.roomburgh3.wleiden.net
-#CHANNEL=44
-#NS_IP=192.168.1.20
-#NSMAC=00:15:6D:EA:F0:28
+MODE=master
+ESSID=il-n.roomburgh3.wleiden.net
+CHANNEL=44
+NS_IP=192.168.1.20
+NSMAC=00:15:6D:EA:F0:28
 VR2
 
Index: nodes/CNodeRosmolen/wleiden.conf
===================================================================
--- nodes/CNodeRosmolen/wleiden.conf	(revision 8260)
+++ nodes/CNodeRosmolen/wleiden.conf	(revision 8261)
@@ -11,5 +11,6 @@
 $Y='465831';
 
-$config{'ath0'}=sprintf <<ATH0;   # AP
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=AP
 TYPE=wireless
 IP=$master_ip/24
@@ -22,5 +23,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0; # a-link naar Broekplein
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=a-link naar Broekplein
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -29,11 +31,12 @@
 SDESC=2Broekplein
 DHCP=no
-#MODE=managed
-#ESSID=il-z.broekplein.wleiden.net
-#CHANNEL=36
-#NSMAC=
+MODE=managed
+ESSID=il-z.broekplein.wleiden.net
+CHANNEL=36
+NSMAC=
 VR0
 
-$config{'vr1'}=sprintf <<VR1; #link naar Roomburgh1
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=link naar Roomburgh1
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -42,13 +45,14 @@
 IP=172.16.3.44/29
 DHCP=no
-#Nano ip 172.16.3.43
-#MODE=managed
-#ESSID=il-nnw.roomburgh1.wleiden.net
-#CHANNEL=124
-#NSMAC=00:15:6D:EA:F0:62
-#NSIP=192.168.1.21
+Nano ip 172.16.3.43
+MODE=managed
+ESSID=il-nnw.roomburgh1.wleiden.net
+CHANNEL=124
+NSMAC=00:15:6D:EA:F0:62
+NSIP=192.168.1.21
 VR1
 
-$config{'vr2'}=sprintf <<VR2; #link naar Regenboog
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=link naar Regenboog
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -57,11 +61,12 @@
 IP=172.16.2.65/30
 DHCP=no
-#MODE=ap
-#ESSID=il-o.rosmolen.wleiden.net
-#CHANNEL=11
-#BulletMAC=
+MODE=ap
+ESSID=il-o.rosmolen.wleiden.net
+CHANNEL=11
+BulletMAC=
 VR2
 
-$config{'ue0'}=sprintf <<UE0;  # Ethernet
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.21.168.65/28
@@ -71,5 +76,6 @@
 UE0
 
-$config{'ue1'}=sprintf <<UE1;  # Link naar Rudi
+$config{'ue1'}=sprintf <<UE1;
+COMMENT=Link naar Rudi
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -78,8 +84,8 @@
 SDESC=2Rudi
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-nw.rosmolen.wleiden.net
-#CHANNEL=3
-#BulletMAC=00:15:6D:
+MODE=bridge ap
+ESSID=il-nw.rosmolen.wleiden.net
+CHANNEL=3
+BulletMAC=00:15:6D:
 UE1
 
Index: nodes/CNodeRudi/wleiden.conf
===================================================================
--- nodes/CNodeRudi/wleiden.conf	(revision 8260)
+++ nodes/CNodeRudi/wleiden.conf	(revision 8261)
@@ -15,14 +15,16 @@
 $Y='466050';
 
-$config{'ep0'}=sprintf <<EP0;  # eth
+$config{'ep0'}=sprintf <<EP0;
+COMMENT=eth
 TYPE=ethernet
 IP=172.23.0.65/29
 DESC=Ethernet naar Xlexit
 SDESC=eth
-#DHCP=68-70
+DHCP=68-70
 DHCP=no
 EP0
 
-$config{'wi0'}=sprintf <<EW0;  # OMNI
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=OMNI
 TYPE=wireless
 IP=$master_ip/26
@@ -35,5 +37,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;  # link naar Rabo
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=link naar Rabo
 TYPE=wireless
 IP=172.16.3.126/30
Index: nodes/CNodeRund/wleiden.conf
===================================================================
--- nodes/CNodeRund/wleiden.conf	(revision 8260)
+++ nodes/CNodeRund/wleiden.conf	(revision 8261)
@@ -20,5 +20,6 @@
 $LOKATIE='IP69 kast aan antennemast, PoE vanuit voorkamer en meterkast.';
 
-$config{'sis0'}=sprintf <<ED0;  # Ethernet
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.17.160.65/28
@@ -34,5 +35,6 @@
 ED0
 
-$config{'wi0'}=sprintf <<EOM;  # AP NW
+$config{'wi0'}=sprintf <<EOM;
+COMMENT=AP NW
 TYPE=wireless
 IP=$master_ip/26
@@ -41,5 +43,5 @@
 
 
-#DHCP=no
+DHCP=no
 DHCP=10-60
 
@@ -54,5 +56,6 @@
 EOM
 
-$config{'wi2'}=sprintf <<EOM; # Link naar vosko2
+$config{'wi2'}=sprintf <<EOM;
+COMMENT=Link naar vosko2
 TYPE=wireless
 IP=172.16.0.177/30
@@ -64,5 +67,5 @@
 ESSID=il-no.vosko2.wleiden.net
 
-#CHANNEL=13
+CHANNEL=13
 
 
Index: nodes/CNodeRustenborch/wleiden.conf
===================================================================
--- nodes/CNodeRustenborch/wleiden.conf	(revision 8260)
+++ nodes/CNodeRustenborch/wleiden.conf	(revision 8261)
@@ -10,5 +10,6 @@
 $Y='466407';
 
-$config{'ath0'}=sprintf <<ATH0;  #  Ap
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=Ap
 TYPE=wireless
 IP=$master_ip/26
@@ -21,5 +22,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # Ethernet
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.23.24.65/28
@@ -29,5 +31,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # Link Lijtweg2
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=Link Lijtweg2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -36,12 +39,13 @@
 DESC=Link naar Lijtweg2
 SDESC=2lijtweg2
-#MODE=bridge station
-#ESSID=il-w.lijtweg2.wleiden.net
-#CHANNEL=116
-#NS_IP=192.168.1.21
-#NSMAC=00:15:6D:
+MODE=bridge station
+ESSID=il-w.lijtweg2.wleiden.net
+CHANNEL=116
+NS_IP=192.168.1.21
+NSMAC=00:15:6D:
 VR1
 
-$config{'vr2'}=sprintf <<VR2;  # Link naar UniGorN 
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=Link naar UniGorN 
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -50,12 +54,13 @@
 DESC=Link naar unigorn
 SDESC=2unigorn
-#MODE=bridge station
-#ESSID=il-o.unigorn.wleiden.net
-#CHANNEL=104
-#NSMAC=00:15:6D:
-#NSIP=192.168.1.21
+MODE=bridge station
+ESSID=il-o.unigorn.wleiden.net
+CHANNEL=104
+NSMAC=00:15:6D:
+NSIP=192.168.1.21
 VR2
  
-$config{'ue0'}=sprintf <<UE0;  # link naar Unused
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=link naar Unused
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -64,7 +69,7 @@
 DESC=Link naar Unused
 SDESC=2unused
-#MODE=master
-#ESSID=il-no.rustenborch.wleiden.net
-#CHANNEL=36
+MODE=master
+ESSID=il-no.rustenborch.wleiden.net
+CHANNEL=36
 UE0
 
Index: nodes/CNodeSHFortis/wleiden.conf
===================================================================
--- nodes/CNodeSHFortis/wleiden.conf	(revision 8260)
+++ nodes/CNodeSHFortis/wleiden.conf	(revision 8261)
@@ -19,5 +19,6 @@
 #$AGGREGATE=22;
 
-$config{'sis0'}=sprintf <<ED0;  # eth
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=eth
 TYPE=ethernet
 IP=172.28.136.65/29
@@ -26,5 +27,5 @@
 SDESC=eth
 
-#DHCP=68-70
+DHCP=68-70
 DHCP=no
 
@@ -34,5 +35,6 @@
 ED0
 
-$config{'wi0'}=sprintf <<EW0;  # OMNI
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=OMNI
 TYPE=wireless
 IP=$master_ip/26
@@ -53,5 +55,6 @@
 
 
-$config{'wi1'}=sprintf <<EW1;  # link naar Koster
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=link naar Koster
 TYPE=wireless
 IP=172.28.1.130/30
@@ -71,5 +74,6 @@
 
 
-$config{'wi2'}=sprintf <<EW2;  # link naar PPFortis
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=link naar PPFortis
 TYPE=wireless
 IP=172.28.1.138/30
Index: nodes/CNodeSOM1/wleiden.conf
===================================================================
--- nodes/CNodeSOM1/wleiden.conf	(revision 8260)
+++ nodes/CNodeSOM1/wleiden.conf	(revision 8261)
@@ -10,5 +10,6 @@
 $status='up';
 
-$config{'ath0'}=sprintf <<ATH0;  # ap noord
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap noord
 TYPE=wireless
 IP=$master_ip/26
@@ -21,5 +22,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # Ethernet naar SOM2
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Ethernet naar SOM2
 TYPE=ethernet
 IP=172.16.3.137/30
@@ -29,5 +31,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # Link naar Broekplein
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=Link naar Broekplein
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -36,11 +39,12 @@
 SDESC=2broekplein
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-n.som1.wleiden.net
-#CHANNEL=132
-#NSMAC=
+MODE=bridge ap
+ESSID=il-n.som1.wleiden.net
+CHANNEL=132
+NSMAC=
 VR1
 
-$config{'vr2'}=sprintf <<VR2;  # Link naar Stadhuis
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=Link naar Stadhuis
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -49,8 +53,8 @@
 SDESC=2Stadhuis
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-z.som1.wleiden.net
-#CHANNEL=52
-#NSMAC=
+MODE=bridge ap
+ESSID=il-z.som1.wleiden.net
+CHANNEL=52
+NSMAC=
 VR2
 
Index: nodes/CNodeSOM2/wleiden.conf
===================================================================
--- nodes/CNodeSOM2/wleiden.conf	(revision 8260)
+++ nodes/CNodeSOM2/wleiden.conf	(revision 8261)
@@ -10,5 +10,6 @@
 $status='up';
 
-$config{'ath0'}=sprintf <<ATH0;  # ap zuidoost
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap zuidoost
 TYPE=wireless
 IP=$master_ip/26
@@ -21,5 +22,6 @@
 ATH0
 
-$config{'ath0:0'}=sprintf <<ATH00;  # link Spoortje
+$config{'ath0:0'}=sprintf <<ATH00;
+COMMENT=link Spoortje
 TYPE=wireless
 DESC=Link naar Spoortje
@@ -29,5 +31,6 @@
 ATH00
 
-$config{'ath0:1'}=sprintf <<ATH01;  # link Zijloever 
+$config{'ath0:1'}=sprintf <<ATH01;
+COMMENT=link Zijloever 
 TYPE=wireless
 IP=172.16.1.61/30
@@ -37,5 +40,6 @@
 ATH01
 
-$config{'ath0:2'}=sprintf <<ATH02;  # link Houtmarkt
+$config{'ath0:2'}=sprintf <<ATH02;
+COMMENT=link Houtmarkt
 TYPE=wireless
 IP=172.16.0.49/30
@@ -45,5 +49,6 @@
 ATH02
 
-$config{'ath0:3'}=sprintf <<ATH03;  # link NodeVeldBies
+$config{'ath0:3'}=sprintf <<ATH03;
+COMMENT=link NodeVeldBies
 TYPE=wireless
 IP=172.16.0.121/30
@@ -53,5 +58,6 @@
 ATH03
 
-$config{'ath0:4'}=sprintf <<ATH04;  # link NodeZwet
+$config{'ath0:4'}=sprintf <<ATH04;
+COMMENT=link NodeZwet
 TYPE=wireless
 IP=172.16.4.137/29
@@ -61,5 +67,6 @@
 ATH04
 
-$config{'vr0'}=sprintf <<VR0;  # Ethernet naar SOM1
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Ethernet naar SOM1
 TYPE=ethernet
 IP=172.16.3.138/30
@@ -69,5 +76,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # Link naar Rabo
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=Link naar Rabo
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -76,11 +84,12 @@
 SDESC=2Rabo
 DHCP=no
-#MODE=bridge ap
-#ESSID=il-w.som2.wleiden.net
-#CHANNEL=140
-#NSMAC=
+MODE=bridge ap
+ESSID=il-w.som2.wleiden.net
+CHANNEL=140
+NSMAC=
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # link naar Graficall
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=link naar Graficall
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -89,8 +98,8 @@
 SDESC=2Graficall
 DHCP=no
-#MODE=bridge station
-#ESSID=il-nw.graficall.wleiden.net
-#CHANNEL=60
-#NSMAC=
+MODE=bridge station
+ESSID=il-nw.graficall.wleiden.net
+CHANNEL=60
+NSMAC=
 VR2
 
Index: nodes/CNodeSpoortje/wleiden.conf
===================================================================
--- nodes/CNodeSpoortje/wleiden.conf	(revision 8260)
+++ nodes/CNodeSpoortje/wleiden.conf	(revision 8261)
@@ -16,5 +16,6 @@
 
 ##########################ethernet######################
-$config{'ep0'}=sprintf <<EP0;  # Ethernet  
+$config{'ep0'}=sprintf <<EP0;
+COMMENT=Ethernet  
 TYPE=ethernet
 DESC=ethernet naar bibliotheek     #Airport : transparant
@@ -25,5 +26,6 @@
 
 #########################eerste wireless kaart#######################
-$config{'wi0'}=sprintf <<EW0;   # Omni
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=Omni
 TYPE=wireless
 DESC=omni voor de buurt
Index: nodes/CNodeStadhuis/wleiden.conf
===================================================================
--- nodes/CNodeStadhuis/wleiden.conf	(revision 8260)
+++ 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
Index: nodes/CNodeThomas/wleiden.conf
===================================================================
--- nodes/CNodeThomas/wleiden.conf	(revision 8260)
+++ nodes/CNodeThomas/wleiden.conf	(revision 8261)
@@ -20,5 +20,6 @@
 $Y='463474';
 
-$config{'sis0'}=sprintf <<ED0;  # Ethernet
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.17.48.65/29
@@ -32,5 +33,6 @@
 ED0
 
-$config{'wi0'}=sprintf <<EW0;  # OMNI
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=OMNI
 TYPE=wireless
 IP=$master_ip/26
@@ -59,5 +61,5 @@
 MODE=managed
 ESSID=il-zo.vosko2.wleiden.net
-#CHANNEL=1
+CHANNEL=1
 
 
@@ -67,5 +69,6 @@
 
 
-$config{'wi2'}=sprintf <<EW2;  # link naar IMI
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=link naar IMI
 TYPE=wireless
 IP=172.16.0.82/30
@@ -76,5 +79,5 @@
 MODE=managed
 ESSID=il-no.imi.wleiden.net
-#CHANNEL=8
+CHANNEL=8
 
 
Index: nodes/CNodeUniGor/wleiden.conf
===================================================================
--- nodes/CNodeUniGor/wleiden.conf	(revision 8260)
+++ nodes/CNodeUniGor/wleiden.conf	(revision 8261)
@@ -13,5 +13,6 @@
 $Y='464813';
 
-$config{'ath0'}=sprintf <<ATH0;  # AP Richting oost
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=AP Richting oost
 TYPE=wireless
 IP=$master_ip/26
@@ -24,5 +25,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # AP Richting zuid via Bullet 1
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=AP Richting zuid via Bullet 1
 TYPE=ethernet
 IP=172.22.8.1/26
@@ -30,12 +32,13 @@
 SDESC=no
 DHCP=10-60
-#Bullet_IP=192.168.1.20
-#BulletMAC=
-#MODE=master
-#ESSID=ap-WirelessLeiden-Unigor-zuid
-#CHANNEL=7
+Bullet_IP=192.168.1.20
+BulletMAC=
+MODE=master
+ESSID=ap-WirelessLeiden-Unigor-zuid
+CHANNEL=7
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # A link naar Cope via nanostation 1
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=A link naar Cope via nanostation 1
 TYPE=ethernet
 IP=172.16.4.33/30
@@ -43,12 +46,13 @@
 SDESC=2copeA
 DHCP=no
-#ESSID=il-Z0.unigor.wleiden.net
-#CHANNEL=128
+ESSID=il-Z0.unigor.wleiden.net
+CHANNEL=128
 #mode 11a bridge master
-#IP nanostation 192.168.1.20
-#NSMAC=00:15:6D:F2:38:A0
+NANO_IP=192.168.1.20
+NSMAC=00:15:6D:F2:38:A0
 VR1
 
-$config{'vr1:0'}=sprintf <<VR10;  # A link naar LUMC
+$config{'vr1:0'}=sprintf <<VR10;
+COMMENT=A link naar LUMC
 TYPE=ethernet
 IP=172.16.4.81/29
@@ -58,5 +62,6 @@
 VR10
 
-$config{'vr2'}=sprintf <<VR2;  # A link naar Robijn via nanostation 2
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=A link naar Robijn via nanostation 2
 TYPE=ethernet
 IP=172.16.4.37/30		
@@ -64,12 +69,13 @@
 SDESC=2robijnA
 DHCP=no
-#IP nanostation 192.168.1.20
-#NSMAC=00:15:6D:F2:38:BD
-#MODE=master
-#ESSID=ilA-z.unigor.wleiden.net
-#CHANNEL=104
+NANO_IP=192.168.1.20
+NSMAC=00:15:6D:F2:38:BD
+MODE=master
+ESSID=ilA-z.unigor.wleiden.net
+CHANNEL=104
 VR2
 
-$config{'vr2:0'}=sprintf <<VR20;  # A Link naar Zwaluwak via nanostation 2
+$config{'vr2:0'}=sprintf <<VR20;
+COMMENT=A Link naar Zwaluwak via nanostation 2
 TYPE=ethernet
 IP=172.16.4.21/30
@@ -78,5 +84,6 @@
 VR20
 
-$config{'vr3'}=sprintf <<VR3;   # Link naar AZC via bullet 2
+$config{'vr3'}=sprintf <<VR3;
+COMMENT=Link naar AZC via bullet 2
 TYPE=ethernet
 IP=172.16.0.165/30
@@ -84,12 +91,13 @@
 SDESC=2azc
 DHCP=no
-#Bullet_IP=192.168.1.20
-#BulletMAC=
-#MODE=master
-#ESSID=n-o.unigor.wleiden.net
-#CHANNEL=1
+Bullet_IP=192.168.1.20
+BulletMAC=
+MODE=master
+ESSID=n-o.unigor.wleiden.net
+CHANNEL=1
 VR3
 
-$config{'vr3:0'}=sprintf <<VR30;  # Link naar Brug via bullet 2
+$config{'vr3:0'}=sprintf <<VR30;
+COMMENT=Link naar Brug via bullet 2
 TYPE=ethernet
 IP=172.16.0.17/30
@@ -99,5 +107,6 @@
 VR30
 
-$config{'vr3:1'}=sprintf <<VR31;  # Link naar Camimplants via bullet 2
+$config{'vr3:1'}=sprintf <<VR31;
+COMMENT=Link naar Camimplants via bullet 2
 TYPE=ethernet
 IP=172.16.1.117/30
@@ -107,5 +116,6 @@
 VR31
 
-$config{'sis0'}=sprintf <<SIS0;  # a-link Nanostation5 naar DirkLos2
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=a-link Nanostation5 naar DirkLos2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -114,12 +124,13 @@
 SDESC=2DirkLos2
 DHCP=no
-#IP nanostation 172.16.4.2
-#NSMAC=00:15:6D:D0:14:75
-#ESSID=il-0.unigor.wleiden.net
-#CHANNEL=52
-#mode 11a bridge master
+NANO_IP=172.16.4.2
+NSMAC=00:15:6D:D0:14:75
+ESSID=il-0.unigor.wleiden.net
+CHANNEL=52
+MODE 11a bridge master
 SIS0
 
-$config{'sis1'}=sprintf <<SIS1;  # EthernetLink UniGorN
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=EthernetLink UniGorN
 TYPE=ethernet
 IP=172.16.1.169/30
@@ -129,5 +140,6 @@
 SIS1
 
-$config{'sis2'}=sprintf <<SIS2;  # Ethernet
+$config{'sis2'}=sprintf <<SIS2;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.19.128.65/28
Index: nodes/CNodeUniGorN/wleiden.conf
===================================================================
--- nodes/CNodeUniGorN/wleiden.conf	(revision 8260)
+++ nodes/CNodeUniGorN/wleiden.conf	(revision 8261)
@@ -11,5 +11,6 @@
 $Y='464861';
 
-$config{'ath0'}=sprintf <<ATH0;  # oegstgeest richting N
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=oegstgeest richting N
 TYPE=wireless
 IP=$master_ip/26
@@ -22,5 +23,6 @@
 ATH0
 
-$config{'ue0'}=sprintf <<UE0; #link naar kaagdorp via Bullet 1
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=link naar kaagdorp via Bullet 1
 TYPE=ethernet
 IP=172.16.1.45/30
@@ -28,10 +30,11 @@
 SDESC=2kaag2
 DHCP=no
-#MODE=master
-#ESSID=il-o.unigorn.wleiden.net
-#CHANNEL=9
+MODE=master
+ESSID=il-o.unigorn.wleiden.net
+CHANNEL=9
 UE0
 
-$config{'ue0:0'}=sprintf <<UE00; #link naar kaag
+$config{'ue0:0'}=sprintf <<UE00;
+COMMENT=link naar kaag
 TYPE=ethernet
 IP=172.16.0.217/30
@@ -41,5 +44,6 @@
 UE00
 
-$config{'vr0'}=sprintf <<VR0;  # A link Hofwijck
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=A link Hofwijck
 TYPE=ethernet
 IP=172.16.4.41/30
@@ -47,12 +51,13 @@
 SDESC=2hofwijck
 DHCP=no
-#MODE=ap bridge
-#ESSID=il-o.unigorn.wleiden.net
-#CHANNEL=104
-#NSMAC=00:15:6D:EA:F0:64
-#NSIP=192.168.1.20
+MODE=ap bridge
+ESSID=il-o.unigorn.wleiden.net
+CHANNEL=104
+NSMAC=00:15:6D:EA:F0:64
+NSIP=192.168.1.20
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # link naar LIACS
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=link naar LIACS
 TYPE=ethernet
 IP=172.16.4.45/30
@@ -60,12 +65,13 @@
 SDESC=2liacs
 DHCP=no
-#MODE=ap bridge
-#ESSID=il-n.unigorn.wleiden.net
-#CHANNEL=128
-#NSMAC=00:15:6D:F2:37:FA
-#NSIP=192.168.1.20
+MODE=ap bridge
+ESSID=il-n.unigorn.wleiden.net
+CHANNEL=128
+NSMAC=00:15:6D:F2:37:FA
+NSIP=192.168.1.20
 VR1
 
-$config{'vr1:0'}=sprintf <<VR10; # link naar Rustenborch  
+$config{'vr1:0'}=sprintf <<VR10;
+COMMENT=link naar Rustenborch  
 TYPE=ethernet
 IP=172.16.1.89/30
@@ -75,5 +81,6 @@
 VR10
 
-$config{'vr2'}=sprintf <<VR2;  # EthernetLink naar UniGor
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=EthernetLink naar UniGor
 TYPE=ethernet
 IP=172.16.1.170/30
Index: nodes/CNodeVeldbies/wleiden.conf
===================================================================
--- nodes/CNodeVeldbies/wleiden.conf	(revision 8260)
+++ nodes/CNodeVeldbies/wleiden.conf	(revision 8261)
@@ -17,5 +17,6 @@
 $Y='465148';
 
-$config{'sis0'}=sprintf <<ED0;  # eth
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=eth
 TYPE=ethernet
 IP=172.25.0.65/29
@@ -31,5 +32,6 @@
 ED0
 
-$config{'wi0'}=sprintf <<EW0;  # OMNI
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=OMNI
 TYPE=wireless
 IP=$master_ip/26
@@ -48,5 +50,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;  # link naar NodeSOM
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=link naar NodeSOM
 TYPE=wireless
 IP=172.16.0.122/30
Index: nodes/CNodeVosko1/wleiden.conf
===================================================================
--- nodes/CNodeVosko1/wleiden.conf	(revision 8260)
+++ nodes/CNodeVosko1/wleiden.conf	(revision 8261)
@@ -11,5 +11,6 @@
 $Y='463657';
 
-$config{'ath0'}=sprintf <<ATH0;  # ap west
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap west
 TYPE=wireless
 IP=$master_ip/26
@@ -22,5 +23,6 @@
 ATH0
 
-$config{'ath0:0'}=sprintf <<ATH00;  # link Thomas
+$config{'ath0:0'}=sprintf <<ATH00;
+COMMENT=link Thomas
 TYPE=wireless
 IP=172.16.0.205/30
@@ -30,5 +32,6 @@
 ATH00
 
-$config{'ath0:1'}=sprintf <<ATH01;  # link OBLSte
+$config{'ath0:1'}=sprintf <<ATH01;
+COMMENT=link OBLSte
 TYPE=wireless
 IP=172.16.3.5/30
@@ -38,5 +41,6 @@
 ATH01
 
-$config{'vr0'}=sprintf <<VR0; # lokaal ethernet
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=lokaal ethernet
 TYPE=ethernet
 IP=172.17.175.71/28
@@ -46,5 +50,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1; # a-link
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=a-link
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -53,16 +58,17 @@
 SDESC=2zw
 DHCP=no
-#MODE=master
-#ESSID=il-zw.vosko1.wleiden.net
-#CHANNEL=64
-#NSMAC=00:15:6D:ED:83:7D
+MODE=master
+ESSID=il-zw.vosko1.wleiden.net
+CHANNEL=64
+NSMAC=00:15:6D:ED:83:7D
 VR1
 
-$config{'vr2'}=sprintf <<VR2;  # Ethernet/PoE naar AP in kerk
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=Ethernet/PoE naar AP in kerk
 TYPE=ethernet
 IP=172.17.174.65/28
 DESC=Ethernet naar Pieterskerk
 SDESC=2kerk
-#IP_NS2-LOCO=192.168.1.20
+NS2_LOCO_IP=192.168.1.20
 DHCP=67-78
 VR2
Index: nodes/CNodeVosko2/wleiden.conf
===================================================================
--- nodes/CNodeVosko2/wleiden.conf	(revision 8260)
+++ nodes/CNodeVosko2/wleiden.conf	(revision 8261)
@@ -11,5 +11,6 @@
 $Y='463657';
 
-$config{'ath0'}=sprintf <<ATH0;  # ap noord
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap noord
 TYPE=wireless
 IP=$master_ip/26
@@ -22,5 +23,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # naar Rund
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=naar Rund
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -29,12 +31,13 @@
 SDESC=2rund
 DHCP=no
-#MODE=master
-#ESSID=il-no.vosko2.wleiden.net
-#CHANNEL=44
-#NSMAC=00:15:6D:F3:35:7D
+MODE=master
+ESSID=il-no.vosko2.wleiden.net
+CHANNEL=44
+NSMAC=00:15:6D:F3:35:7D
 VR0
 
 
-$config{'vr1'}=sprintf <<VR1; # link Robijn
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=link Robijn
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -42,13 +45,14 @@
 DESC=interlink w (Robijn)
 SDESC=2Robijn
-#MODE=master
-#ESSID=il-w.vosko2.wleiden.net
-#CHANNEL=140
-#NS_IP=172.16.4.114/29
-#NSMAC=00:15:6D:F7:BE:F7
+MODE=master
+ESSID=il-w.vosko2.wleiden.net
+CHANNEL=140
+NS_IP=172.16.4.114/29
+NSMAC=00:15:6D:F7:BE:F7
 DHCP=no
 VR1
 
-$config{'vr1:0'}=sprintf <<VR10; # link naar Huub
+$config{'vr1:0'}=sprintf <<VR10;
+COMMENT=link naar Huub
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -59,5 +63,6 @@
 VR10
 
-$config{'vr1:1'}=sprintf <<VR11; # link naar BCSte
+$config{'vr1:1'}=sprintf <<VR11;
+COMMENT=link naar BCSte
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -68,5 +73,6 @@
 VR11
 
-$config{'vr2'}=sprintf <<VR2; # lokaal ethernet (naar Vosko1, 3) 
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=lokaal ethernet (naar Vosko1, 3) 
 TYPE=ethernet
 IP=172.17.175.72/28
Index: nodes/CNodeVosko3/wleiden.conf
===================================================================
--- nodes/CNodeVosko3/wleiden.conf	(revision 8260)
+++ nodes/CNodeVosko3/wleiden.conf	(revision 8261)
@@ -11,5 +11,6 @@
 $Y='463657';
 
-$config{'ath0'}=sprintf <<ATH0;  # ap zuidoost
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap zuidoost
 TYPE=wireless
 IP=$master_ip/26
@@ -22,5 +23,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # a-link to Stadhuis via Nanostation5
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=a-link to Stadhuis via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -29,11 +31,12 @@
 SDESC=2stadhuis
 DHCP=no
-#MODE=master
-#ESSID=il-o.vosko3.wleiden.net
-#CHANNEL=108
-#NSMAC=
+MODE=master
+ESSID=il-o.vosko3.wleiden.net
+CHANNEL=108
+NSMAC=
 VR0
 
-$config{'vr0:0'}=sprintf <<VR00; # to nanostation mgmt interface
+$config{'vr0:0'}=sprintf <<VR00;
+COMMENT=to nanostation mgmt interface
 TYPE=ethernet
 IP=172.16.3.177/30
@@ -44,5 +47,6 @@
 
 
-$config{'vr1'}=sprintf <<VR1; # a-link to Plantsoen via Nanostation5
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=a-link to Plantsoen via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -51,11 +55,12 @@
 SDESC=2Plantsoen
 DHCP=no
-#MODE=master
-#ESSID=il-zo.vosko3.wleiden.net
-#CHANNEL=92
-#NSMAC=
+MODE=master
+ESSID=il-zo.vosko3.wleiden.net
+CHANNEL=92
+NSMAC=
 VR1
 
-$config{'vr1:0'}=sprintf <<VR10; # to nanostation mgmt interface
+$config{'vr1:0'}=sprintf <<VR10;
+COMMENT=to nanostation mgmt interface
 TYPE=ethernet
 IP=172.16.3.181/30
@@ -65,5 +70,6 @@
 VR10
 
-$config{'vr2'}=sprintf <<VR2; # a-link to DirkLos1 via Nanostation5
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=a-link to DirkLos1 via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -71,13 +77,14 @@
 DESC=ethernet to interlink wnw (DirkLos1)
 SDESC=2DirkLos1
-#MODE=master
-#ESSID=il-wnw.vosko3.wleiden.net
-#CHANNEL=100
-#NSMAC=00:15:6D:BD:68:9B
-#NSIP=172.16.4.74/29
+MODE=master
+ESSID=il-wnw.vosko3.wleiden.net
+CHANNEL=100
+NSMAC=00:15:6D:BD:68:9B
+NSIP=172.16.4.74/29
 DHCP=no
 VR2
 
-$config{'vr2:0'}=sprintf <<VR20; # a-link to Geluidsnet2
+$config{'vr2:0'}=sprintf <<VR20;
+COMMENT=a-link to Geluidsnet2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -88,5 +95,6 @@
 VR20
 
-$config{'ue0'}=sprintf <<UE0; # lokaal ethernet via usb-lan adapter
+$config{'ue0'}=sprintf <<UE0;
+COMMENT=lokaal ethernet via usb-lan adapter
 TYPE=ethernet
 IP=172.17.175.73/28
@@ -94,4 +102,4 @@
 SDESC=ethernet
 DHCP=no
-#USB-LAN-adapterMAC=00:00:e8:00:11:36
+USB-LAN-adapterMAC=00:00:e8:00:11:36
 UE0
Index: nodes/CNodeWBRotary1/wleiden.conf
===================================================================
--- nodes/CNodeWBRotary1/wleiden.conf	(revision 8260)
+++ nodes/CNodeWBRotary1/wleiden.conf	(revision 8261)
@@ -19,5 +19,6 @@
 $AGGREGATE=22;
 
-$config{'sis0'}=sprintf <<ED0;  # eth
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=eth
 TYPE=ethernet
 IP=172.25.52.65/29
@@ -26,5 +27,5 @@
 SDESC=eth
 
-#DHCP=68-70
+DHCP=68-70
 DHCP=no
 
@@ -33,5 +34,6 @@
 ED0
 
-$config{'sis1'}=sprintf <<ED0;  # eth
+$config{'sis1'}=sprintf <<ED0;
+COMMENT=eth
 TYPE=ethernet
 IP=172.16.1.121/30
@@ -40,5 +42,5 @@
 SDESC=2WBRotary2
 
-#DHCP=68-70
+DHCP=68-70
 DHCP=no
 
@@ -47,5 +49,6 @@
 ED0
 
-$config{'wi0'}=sprintf <<EW0;  # link naar HMKerk1
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=link naar HMKerk1
 TYPE=wireless
 IP=172.16.2.29/30
@@ -62,5 +65,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;  # OMNI
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=OMNI
 TYPE=wireless
 IP=$master_ip/26
@@ -80,5 +84,6 @@
 
 
-$config{'wi2'}=sprintf <<EW2;  # link naar Gerard
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=link naar Gerard
 
 TYPE=wireless
@@ -99,5 +104,6 @@
 EW2
 
-$config{'wi2:0'}=sprintf <<WI20;  # Link Zwet
+$config{'wi2:0'}=sprintf <<WI20;
+COMMENT=Link Zwet
 TYPE=ethernet
 IP=172.16.4.131/29
@@ -108,17 +114,19 @@
 WI20
 
-#$config{'wi2:0'}=sprintf <<EW20;  # link naar Zoetermeer Aalstlaan
-#TYPE=wireless
-#IP=172.16.2.29/30
-#DESC=Link naar zoetermeer aalstlaan
-#SDESC=2aalstlaan.wlztm
-#EW20
+$config{'wi2:0'}=sprintf <<EW20; 
+COMMENT=link naar Zoetermeer Aalstlaan
+TYPE=wireless
+IP=172.16.16.5/30
+DESC=Link naar zoetermeer aalstlaan
+SDESC=2aalstlaan.wlztm
+EW20
 
-#$config{'wi2:1'}=sprintf <<EW21;  # link naar Koudekerk Trekkertrek
-#TYPE=wireless
-#IP=172.16.2.37/30
-#DESC=Link naar Trekkertrek
-#SDESC=2Trekkertrek
-#EW21
+$config{'wi2:1'}=sprintf <<EW21;
+COMMENT=link naar Koudekerk Trekkertrek
+TYPE=wireless
+IP=172.16.2.37/30
+DESC=Link naar Trekkertrek
+SDESC=2Trekkertrek
+EW21
 
 
Index: nodes/CNodeWBRotary2/wleiden.conf
===================================================================
--- nodes/CNodeWBRotary2/wleiden.conf	(revision 8260)
+++ nodes/CNodeWBRotary2/wleiden.conf	(revision 8261)
@@ -19,5 +19,6 @@
 $AGGREGATE=22;
 
-$config{'sis0'}=sprintf <<ED0;  # eth
+$config{'sis0'}=sprintf <<ED0;
+COMMENT=eth
 TYPE=ethernet
 IP=172.25.56.65/29
@@ -26,5 +27,5 @@
 SDESC=eth
 
-#DHCP=68-70
+DHCP=68-70
 DHCP=no
 
@@ -33,5 +34,6 @@
 ED0
 
-$config{'sis1'}=sprintf <<ED1;  # ethernet naar CNodeWBRotary1
+$config{'sis1'}=sprintf <<ED1;
+COMMENT=ethernet naar CNodeWBRotary1
 TYPE=ethernet
 IP=172.16.1.122/30
@@ -40,5 +42,5 @@
 SDESC=2wbrotary1
 
-#DHCP=68-70
+DHCP=68-70
 DHCP=no
 
@@ -47,5 +49,6 @@
 ED1
 
-$config{'wi0'}=sprintf <<EW0;  # OMNI
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=OMNI
 TYPE=wireless
 IP=$master_ip/26
@@ -65,5 +68,6 @@
 
 
-$config{'wi1'}=sprintf <<EW1;  # link naar Rijnsaterwoude Gemeentehuis
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=link naar Rijnsaterwoude Gemeentehuis
 TYPE=wireless
 IP=172.16.2.25/30
@@ -83,5 +87,6 @@
 
 
-$config{'wi2'}=sprintf <<EW2;  # link naar Alphen HWFortis
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=link naar Alphen HWFortis
 TYPE=wireless
 IP=172.16.0.45/30
Index: nodes/CNodeWP/wleiden.conf
===================================================================
--- nodes/CNodeWP/wleiden.conf	(revision 8260)
+++ nodes/CNodeWP/wleiden.conf	(revision 8261)
@@ -17,5 +17,6 @@
 $status='up';
 
-$config{'sis0'}=sprintf <<SIS0;  # eth
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=eth
 TYPE=ethernet
 IP=172.19.168.65/29
@@ -31,5 +32,6 @@
 
 
-$config{'wi0'}=sprintf <<EW0;  # Locale Omni
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=Locale Omni
 TYPE=wireless
 IP=$master_ip/26
@@ -49,5 +51,6 @@
 
 
-$config{'wi1'}=sprintf <<EW1;  # Link naar AZC
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=Link naar AZC
 TYPE=wireless
 #11=Wandy WP depedance
Index: nodes/CNodeWissel/wleiden.conf
===================================================================
--- nodes/CNodeWissel/wleiden.conf	(revision 8260)
+++ nodes/CNodeWissel/wleiden.conf	(revision 8261)
@@ -13,5 +13,6 @@
 $status='up';
 
-$config{'ep0'}=sprintf <<EP0;  # eth
+$config{'ep0'}=sprintf <<EP0;
+COMMENT=eth
 TYPE=ethernet
 IP=172.19.182.65/29
@@ -21,5 +22,6 @@
 EP0
 
-$config{'wi0'}=sprintf <<EW0;  # Locale Omni
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=Locale Omni
 TYPE=wireless
 IP=$master_ip/26
@@ -32,5 +34,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;  # Link naar AZC
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=Link naar AZC
 TYPE=wireless
 IP=172.16.2.54/30
Index: nodes/CNodeZijloever/wleiden.conf
===================================================================
--- nodes/CNodeZijloever/wleiden.conf	(revision 8260)
+++ nodes/CNodeZijloever/wleiden.conf	(revision 8261)
@@ -18,5 +18,6 @@
 $Y='464073';
 
-$config{'ep0'}=sprintf <<ED0;  # Ethernet
+$config{'ep0'}=sprintf <<ED0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.19.0.65/28
@@ -32,5 +33,6 @@
 
 
-$config{'wi0'}=sprintf <<EW0;  # omni
+$config{'wi0'}=sprintf <<EW0;
+COMMENT=omni
 TYPE=wireless
 IP=$master_ip/26
@@ -49,5 +51,6 @@
 EW0
 
-$config{'wi1'}=sprintf <<EW1;  # link naar SOM
+$config{'wi1'}=sprintf <<EW1;
+COMMENT=link naar SOM
 TYPE=wireless
 IP=172.16.1.62/30
@@ -58,5 +61,5 @@
 MODE=managed
 ESSID=il-z.som.wleiden.net
-#CHANNEL=5
+CHANNEL=5
 
 
@@ -65,5 +68,6 @@
 EW1
 
-$config{'wi2'}=sprintf <<EW2;  # link naar Roomburgh1
+$config{'wi2'}=sprintf <<EW2;
+COMMENT=link naar Roomburgh1
 TYPE=wireless
 IP=172.16.0.230/30
@@ -74,5 +78,5 @@
 ESSID=il-n.roomburgh1.wleiden.net
 
-#CHANNEL=3
+CHANNEL=3
 
 
Index: nodes/CNodeZwaluwak/wleiden.conf
===================================================================
--- nodes/CNodeZwaluwak/wleiden.conf	(revision 8260)
+++ nodes/CNodeZwaluwak/wleiden.conf	(revision 8261)
@@ -15,5 +15,6 @@
 $Y='463249';
 
-$config{'ath0'}=sprintf <<ATH0;   # Omni
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=Omni
 TYPE=wireless
 IP=$master_ip/26
@@ -26,5 +27,6 @@
 ATH0
 
-$config{'vr0'}=sprintf <<VR0;  # Ethernet
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=172.22.0.65/30
@@ -35,5 +37,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # link naar Unused via Bullet 1
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=link naar Unused via Bullet 1
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -42,11 +45,12 @@
 SDESC=2unused
 DHCP=no
-#Bullet_IP=192.168.1.20
-#BulletMAC=00:15:6D:E8:E7:4A
-#MODE=managed
-#ESSID=effeniks
+Bullet_IP=192.168.1.20
+BulletMAC=00:15:6D:E8:E7:4A
+MODE=managed
+ESSID=effeniks
 VR1
 
-$config{'vr2'}=sprintf <<VR2; # link naar BCStevenshof via Bullet 2
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=link naar BCStevenshof via Bullet 2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -55,11 +59,12 @@
 DESC=Link naar BCsSte
 SDESC=2bcste
-#Bullet_IP=172.16.3.252/29
-#BulletMAC=00:15:6D:E8:E6:A3
-#MODE=managed
-#ESSID=il-nw.bcste.wleiden.net
+Bullet_IP=172.16.3.252/29
+BulletMAC=00:15:6D:E8:E6:A3
+MODE=managed
+ESSID=il-nw.bcste.wleiden.net
 VR2
 
-$config{'aue0'}=sprintf <<UE0; # a-link naar NodeUnigor via Airlive
+$config{'aue0'}=sprintf <<UE0;
+COMMENT=a-link naar NodeUnigor via Airlive
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -69,7 +74,6 @@
 SDESC=2unigor
 DHCP=no
+AIRLIVE_IP=192.168.1.21
+MODE=managed
+ESSID=ilA-z.unigor.wleiden.net
 UE0
-#AIRLIVE_IP=192.168.1.21
-#MODE=managed
-#ESSID=ilA-z.unigor.wleiden.net
-UE00
Index: nodes/CNodeZwet/wleiden.conf
===================================================================
--- nodes/CNodeZwet/wleiden.conf	(revision 8260)
+++ nodes/CNodeZwet/wleiden.conf	(revision 8261)
@@ -30,5 +30,6 @@
 
 
-$config{'vr0'}=sprintf <<VR0; # Link naar Zwet Network
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=Link naar Zwet Network
 TYPE=ethernet
 IP=172.27.129.65/28
@@ -42,5 +43,6 @@
 
 
-$config{'vr1'}=sprintf <<VR1;  # Link SOM2
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=Link SOM2
 TYPE=ethernet
 IP=172.16.4.142/29
@@ -51,5 +53,6 @@
 VR1
 
-$config{'vr2'}=sprintf <<VR2;  # Link WBRotary1
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=Link WBRotary1
 TYPE=ethernet
 IP=172.16.4.129/29
Index: nodes/proxy1/wleiden.conf
===================================================================
--- nodes/proxy1/wleiden.conf	(revision 8260)
+++ nodes/proxy1/wleiden.conf	(revision 8261)
@@ -19,5 +19,6 @@
 $Y='463889';
 
-$config{'sis0'}=sprintf <<SIS0;  # Ethernet
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=83.162.36.91/24                                                                             
@@ -27,5 +28,6 @@
 SIS0
 
-$config{'sis1'}=sprintf <<SIS1;  # link naar NodeCope
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=link naar NodeCope
 TYPE=ethernet
 IP=$master_ip/28                                                               
Index: nodes/proxy10/wleiden.conf
===================================================================
--- nodes/proxy10/wleiden.conf	(revision 8260)
+++ nodes/proxy10/wleiden.conf	(revision 8261)
@@ -21,5 +21,6 @@
 $Y='463249';
 
-$config{'sis0'}=sprintf <<SIS0;  # Ethernet
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=$master_ip/30
Index: nodes/proxy11/wleiden.conf
===================================================================
--- nodes/proxy11/wleiden.conf	(revision 8260)
+++ nodes/proxy11/wleiden.conf	(revision 8261)
@@ -23,5 +23,6 @@
 $Y='466843';
 
-$config{'sis0'}=sprintf <<SIS0;  # Ethernet
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=$master_ip/30
@@ -33,5 +34,6 @@
 SIS0
 
-$config{'sis1'}=sprintf <<SIS1;  # Ethernet naar adsl
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=Ethernet naar adsl
 TYPE=ethernet                                                                              
 IP=192.168.1.70
Index: nodes/proxy12/wleiden.conf
===================================================================
--- nodes/proxy12/wleiden.conf	(revision 8260)
+++ nodes/proxy12/wleiden.conf	(revision 8261)
@@ -21,5 +21,6 @@
 $nat='yes';
 
-$config{'sis0'}=sprintf <<SIS0;  # link naar Router
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=link naar Router
 TYPE=ethernet
 IP=0.0.0.0
@@ -29,5 +30,6 @@
 SIS0
 
-$config{'sis1'}=sprintf <<SIS1;  # link naar NodeHuub
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=link naar NodeHuub
 TYPE=ethernet
 IP=$master_ip/30
Index: nodes/proxy13/wleiden.conf
===================================================================
--- nodes/proxy13/wleiden.conf	(revision 8260)
+++ nodes/proxy13/wleiden.conf	(revision 8261)
@@ -17,5 +17,6 @@
 $Y='461987';
 
-$config{'sis0'}=sprintf <<SIS0;  # link naar Router
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=link naar Router
 TYPE=ethernet
 DHCPCLIENT=yes
@@ -26,5 +27,6 @@
 SIS0
 
-$config{'sis1'}=sprintf <<SIS1;  # link naar NodeRick
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=link naar NodeRick
 TYPE=ethernet
 IP=$master_ip/30
Index: nodes/proxy2/wleiden.conf
===================================================================
--- nodes/proxy2/wleiden.conf	(revision 8260)
+++ nodes/proxy2/wleiden.conf	(revision 8261)
@@ -18,5 +18,6 @@
 $Y='463704';
 
-$config{'sis0'}=sprintf <<SIS0;  # Link naar router
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=Link naar router
 TYPE=ethernet 
 
@@ -29,5 +30,6 @@
 SIS0
 
-$config{'sis1'}=sprintf <<SIS1;  # Link naar NodeCeTIM
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=Link naar NodeCeTIM
 TYPE=ethernet
 IP=$master_ip/28
@@ -37,5 +39,6 @@
 SIS1
 
-$config{'sis2'}=sprintf <<SIS2;  # Lokaal Ethernet naar kerk
+$config{'sis2'}=sprintf <<SIS2;
+COMMENT=Lokaal Ethernet naar kerk
 TYPE=ethernet
 IP=172.17.143.17/26
Index: nodes/proxy3/wleiden.conf
===================================================================
--- nodes/proxy3/wleiden.conf	(revision 8260)
+++ nodes/proxy3/wleiden.conf	(revision 8261)
@@ -15,5 +15,6 @@
 $Y='462819';
 
-$config{'sis0'}=sprintf <<SIS0;  # Ethernet
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=83.160.182.75/24                                                                        
@@ -23,5 +24,6 @@
 SIS0
 
-$config{'sis1'}=sprintf <<SIS1;  # Ethernet
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=Ethernet
 TYPE=ethernet
 IP=$master_ip/29
Index: nodes/proxy4/wleiden.conf
===================================================================
--- nodes/proxy4/wleiden.conf	(revision 8260)
+++ nodes/proxy4/wleiden.conf	(revision 8261)
@@ -21,5 +21,6 @@
 $Y='462256';
 
-$config{'sis0'}=sprintf <<SIS0;  # Link naar Router
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=Link naar Router
 TYPE=ethernet 
 IP=192.168.1.100/24                                                         
@@ -31,5 +32,6 @@
 SIS0
 
-$config{'sis1'}=sprintf <<SIS1;  # Link naar NodeLivingLab
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=Link naar NodeLivingLab
 TYPE=ethernet
 IP=$master_ip/30
Index: nodes/proxy5/wleiden.conf
===================================================================
--- nodes/proxy5/wleiden.conf	(revision 8260)
+++ nodes/proxy5/wleiden.conf	(revision 8261)
@@ -20,5 +20,6 @@
 $Y='465365';
 
-$config{'sis0'}=sprintf <<SIS0;  # Link naar router
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=Link naar router
 TYPE=ethernet
 IP=192.168.0.16/24                                                                               
@@ -28,5 +29,6 @@
 SIS0
 
-$config{'sis1'}=sprintf <<SIS1;  # Link naar NodeWP
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=Link naar NodeWP
 TYPE=ethernet
 IP=$master_ip/30
Index: nodes/proxy6/wleiden.conf
===================================================================
--- nodes/proxy6/wleiden.conf	(revision 8260)
+++ nodes/proxy6/wleiden.conf	(revision 8261)
@@ -21,5 +21,6 @@
 
 
-$config{'sis0'}=sprintf <<SIS0;  # link naar Router
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=link naar Router
 TYPE=ethernet
 IP=192.168.1.200/24
@@ -29,5 +30,6 @@
 SIS0
 
-$config{'sis1'}=sprintf <<SIS1;  # link naar NodeMuiderkring
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=link naar NodeMuiderkring
 TYPE=ethernet
 IP=$master_ip/30
Index: nodes/proxy62/wleiden.conf
===================================================================
--- nodes/proxy62/wleiden.conf	(revision 8260)
+++ nodes/proxy62/wleiden.conf	(revision 8261)
@@ -20,5 +20,6 @@
 $Y='463569';
 
-$config{'vr0'}=sprintf <<VR0;  # link naar Router
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=link naar Router
 TYPE=ethernet
 IP=192.168.3.101/24
@@ -28,5 +29,6 @@
 VR0
 
-$config{'vr1'}=sprintf <<VR1;  # link naar NodeHuub
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=link naar NodeHuub
 TYPE=ethernet
 IP=$master_ip/30
Index: nodes/proxy7/wleiden.conf
===================================================================
--- nodes/proxy7/wleiden.conf	(revision 8260)
+++ nodes/proxy7/wleiden.conf	(revision 8261)
@@ -23,5 +23,6 @@
 $Y='463407';
 
-$config{'sis0'}=sprintf <<SIS0;  # Link naar Router
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=Link naar Router
 TYPE=ethernet
 IP=192.168.200.100/24
@@ -31,5 +32,6 @@
 SIS0
 
-$config{'sis1'}=sprintf <<SIS1;  # Local 24-subnet to node and clients
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=Local 24-subnet to node and clients
 TYPE=ethernet
 IP=$master_ip/24
Index: nodes/proxy8/wleiden.conf
===================================================================
--- nodes/proxy8/wleiden.conf	(revision 8260)
+++ nodes/proxy8/wleiden.conf	(revision 8261)
@@ -23,5 +23,6 @@
 
 
-$config{'sis0'}=sprintf <<SIS0;  # Link naar Router
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=Link naar Router
 TYPE=ethernet
 IP=192.168.58.2/24
@@ -34,5 +35,6 @@
 SIS0
 
-$config{'sis1'}=sprintf <<SIS1;  # Link naar Laptop
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=Link naar Laptop
 TYPE=ethernet
 IP=$master_ip/30
Index: nodes/proxy9/wleiden.conf
===================================================================
--- nodes/proxy9/wleiden.conf	(revision 8260)
+++ nodes/proxy9/wleiden.conf	(revision 8261)
@@ -19,5 +19,6 @@
 $Y='462845';
 
-$config{'sis0'}=sprintf <<SIS0;  # Link naar Router
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=Link naar Router
 TYPE=ethernet
 IP=192.168.1.100/24
@@ -27,5 +28,6 @@
 SIS0
 
-$config{'sis1'}=sprintf <<SIS1;  # Link naar Node
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=Link naar Node
 TYPE=ethernet
 IP=$master_ip/30
Index: nodes/proxy97/wleiden.conf
===================================================================
--- nodes/proxy97/wleiden.conf	(revision 8260)
+++ nodes/proxy97/wleiden.conf	(revision 8261)
@@ -20,5 +20,6 @@
 $Y='463238';
 
-$config{'sis0'}=sprintf <<SIS0;  # link naar router
+$config{'sis0'}=sprintf <<SIS0;
+COMMENT=link naar router
 TYPE=ethernet
 IP=10.0.1.100/24
@@ -28,5 +29,6 @@
 SIS0
 
-$config{'sis1'}=sprintf <<SIS1;  # link naar NodePlantsoen2
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=link naar NodePlantsoen2
 TYPE=ethernet
 IP=$master_ip/28