Index: nodes/CNodeWBRotary/wleiden.conf
===================================================================
--- nodes/CNodeWBRotary1/wleiden.conf	(revision 9688)
+++ nodes/CNodeWBRotary/wleiden.conf	(revision 9699)
@@ -1,8 +1,8 @@
 #
-# config CNodeWBRotary1
+# config CNodeWBRotary
 $location="NH Kerk, Comriekade 7, 2481 AD, Woubrugge";
 $master_ip='172.25.52.1';  
 $nodetype='CNode';
-$nodename='WBRotary1';
+$nodename='WBRotary';
 $release="8.2-RELEASE";
 $status='up';
@@ -16,5 +16,5 @@
 IP=$master_ip/26
 DESC=ap voor de buurt
-SDESC=omni
+SDESC=apno
 DHCP=10-60
 MODE=master
@@ -24,17 +24,13 @@
 
 $config{'ue0'}=sprintf <<UE0;
-COMMENT=link naar Henk
-TYPE=ethernet
-STATUS=down
-EXTRA_TYPE=eth2wifibridge
-DESC=Link naar Henk
-SDESC=2henk
-IP=172.16.18.33/29
-DHCP=no
-MODE=ap
-ESSID=il-n.wbrotary1.wleiden.net
-CHANNEL=144
-NSIP=172.16.18.34/29
-NSMAC=
+COMMENT=ap voor de buurt
+TYPE=wireless
+IP= 172.25.56.1/26
+DESC=ap voor de buurt
+SDESC=apzw
+DHCP=10-60
+MODE=master
+ESSID=ap-WirelessLeiden-RotaryZW
+CHANNEL=3
 UE0
 
@@ -49,24 +45,24 @@
 SDESC=2graficall
 MODE=ap bridge
-ESSID=il-w.wbrotary2.wleiden.net
+ESSID=il-w.wbrotary.wleiden.net
 CHANNEL=36
-NSMAC=00:15:6D:
+NSMAC=00:27:22:10:34:C6
 NSIP=172.16.18.42/29
 VR0
 
 $config{'vr1'}=sprintf <<VR1;
-COMMENT=link naar HMKerk
+COMMENT=link naar proxy18
 TYPE=ethernet
 STATUS=down
 EXTRA_TYPE=eth2wifibridge
-IP= 172.16.16.241/29
+DESC=Link naar Henk
+SDESC=2proxy18
+IP=172.16.18.33/29
 DHCP=no
-DESC=Link naar HMKerk
-SDESC=2hmkerk
-MODE=ap bridge
-ESSID=il-w.wbrotary1.wleiden.net
-CHANNEL=161
-NSMAC=00:15:6D:
-NSIP=172.16.16.242/29
+MODE=ap
+ESSID=il-n.wbrotary.wleiden.net
+CHANNEL=144
+NSIP=172.16.18.34/29
+NSMAC=00:15:6D:8E:DD:81
 VR1