Index: nodes/CNodeLMkempers1/wleiden.conf
===================================================================
--- nodes/CNodeLMkempers1/wleiden.conf	(revision 8684)
+++ nodes/CNodeLMkempers1/wleiden.conf	(revision 9480)
@@ -4,89 +4,47 @@
 # config CNodeLMkempers1
 $location="Jachthaven Kempers, Herenweg 100, 2451 VS,  Leimuiden";
-$master_ip='172.25.80.65';
+$master_ip='172.25.80.1';
 $nodetype='CNode';
 $nodename='LMkempers1';
-$release="7.2-RELEASE";
+$release="8.2-RELEASE";
 
-
-$status='down';
+$status='up';
 
 $X='107020';
 $Y='471200';
 
-$AGGREGATE=22;
-
-$config{'sis0'}=sprintf <<ED0;
-COMMENT=ethernet
-STATUS=up poort 0 Soekris
+$config{'vr0'}=sprintf <<EOT;
+STATUS=up
+DESC=Ethernet Cross Connect
+SDESC=2kempers2
 TYPE=ethernet
 STATUS=up
-IP=$master_ip/29
+IP=172.16.16.65/29
+DHCP=no
+EOT
 
-DESC=Ethernet poort kempers1
-SDESC=eth
-
+$config{'vr1'}=sprintf <<EOT;
+TYPE=ethernet
+STATUS=up
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.16.140/29
+DESC=Nanostation5M naar Watertoren
+SDESC=2watertoren
 DHCP=no
+MODE=bridge ap
+ESSID=il-nw.watertoren3.wleiden.net
+NSIP=172.16.16.139/29
+NSMAC=00:27:22:10:FD:ED
+EOT
 
 
-ED0
-
-$config{'sis1'}=sprintf <<ED1;
-COMMENT=eth poort 1 naar node kempers2 
-TYPE=ethernet
-STATUS=up
-IP=172.16.1.201/30
-
-DESC=Ethernet naar kempers2
-SDESC=2lmkempers2
-
-DHCP=no
-
-
-
-ED1
-
-$config{'wi0'}=sprintf <<EW0;
-COMMENT=Link naar LMDorp 
+$config{'ath0'}=sprintf <<EW0;
 TYPE=wireless
-IP=172.16.1.193/30
-DESC=Link naar LMDorp 
-SDESC=2lmdorp
-
+IP=$master_ip/26
+DESC=OMNI voor Wifi op de westeinder
+SDESC=ap-omni
+DHCP=20-60
 MODE=master
-ESSID=il-zw.kmprs.wleiden.net
-CHANNEL=1
-
-DHCP=no
-
+ESSID=ap-Westeinder-Kempers1
+CHANNEL=8
 EW0
-
-$config{'wi0:0'}=sprintf <<EW00;
-COMMENT=link naar lmstruykverwo2
-TYPE=wireless
-IP=172.16.1.205/30
-
-DESC=Link naar lmstruykverwo2
-SDESC=2lmstruykverwo2
-
-
-
-DHCP=no
-
-EW00
-
-$config{'wi1'}=sprintf <<EW1;
-COMMENT=link kempers naar BDBoon
-TYPE=wireless
-IP=172.16.1.213/30
-DESC=Link naar BDBoon
-SDESC=2BDBoon
-
-
-MODE=master
-ESSID=il-zo.kmprs.wleiden.net
-CHANNEL=13
-
-DHCP=no
-
-EW1