Index: nodes/CNodeHuub/wleiden.conf
===================================================================
--- nodes/CNodeHuub/wleiden.conf	(revision 7704)
+++ nodes/CNodeHuub/wleiden.conf	(revision 8100)
@@ -1,6 +1,2 @@
-#
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeHuub
@@ -14,8 +10,8 @@
 $Y='463569';
 
-$config{'ath0'}=sprintf <<AT0;  # Ap voor buurt
+$config{'ath0'}=sprintf <<AT0;  # Ap
 TYPE=wireless
 IP=$master_ip/26
-DESC=AP voor de buurt
+DESC=AP
 SDESC=ap
 DHCP=10-60
@@ -40,18 +36,10 @@
 SDESC=2rabo
 DHCP=no
-SIS1
-
-$config{'sis1:0'}=sprintf <<SIS10; # to nanostation mgmt interface
-TYPE=ethernet
-IP=172.16.3.253/30
-DESC=ethernet to nanostation mgmt interface
-SDESC=manageNS5
-DHCP=no
 #MODE=managed
 #ESSID=il-z.rabo.wleiden.net
 #CHANNEL=44
-#IP=172.16.3.253
-SIS10
-
+#NSMAC=00:15:6D:BD:89:CB
+#NSIP=192.168.1.21
+SIS1
 
 $config{'sis2'}=sprintf <<SIS2;  # link naar Cetim2
@@ -62,18 +50,10 @@
 SDESC=2cetim2
 DHCP=no
+#MODE=managed bridge
+#ESSID=il-zw.cetim2.wleiden.net
+#CHANNEL=
+#NSMAC=00:15:6D:F2:39:3D
+#NSIP=192.168.1.21
 SIS2
-
-$config{'sis2:0'}=sprintf <<SIS20; # to bullet2 mgmt interface
-TYPE=ethernet
-IP=172.16.4.5/30
-DESC=ethernet to bullet2 mgmt interface
-SDESC=manageBL2
-DHCP=no
-#MODE=managed
-#ESSID=il-zw.cetim2.wleiden.net
-#CHANNEL=11
-#IP=172.16.4.6
-SIS20
-
 
 $config{'sis3'}=sprintf <<SIS3; # link naar Vosko1
@@ -84,17 +64,10 @@
 SDESC=2vosko1
 DHCP=no
+#MODE=managed bridge
+#ESSID=il-zw.vosko1.wleiden.net
+#CHANNEL=64
+#NSMAC=00:15:6D:70:54:BA
+#NSIP=192.168.1.21
 SIS3
-
-$config{'sis3:0'}=sprintf <<SIS30; # to bullet2 mgmt interface
-TYPE=ethernet
-IP=172.16.4.9/30
-DESC=ethernet to bullet2 mgmt interface
-SDESC=manageBL2
-DHCP=no
-#MODE=managed
-#ESSID=il-zw.vosko1.wleiden.net
-#CHANNEL=13
-#IP=172.16.4.10
-SIS30
 
 $config{'sis4'}=sprintf <<SIS4; # link naar Stadhuis