Index: nodes/CNodeRund/wleiden.conf
===================================================================
--- nodes/CNodeRund/wleiden.conf	(revision 8493)
+++ nodes/CNodeRund/wleiden.conf	(revision 9794)
@@ -1,92 +1,72 @@
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeRund
-
 $location="Dirk-Willem, Jan Vossensteeg/Rundermakt, 2312 WC, Leiden";
 $master_ip='172.17.160.1';  
 $nodetype='CNode';
 $nodename='Rund';
-
-$status='up';
-$release="5.0-RELEASE";
-
-
-# edugis x,y 93763,464042
+$release="8.2-RELEASE";
+$ileiden='yes';
+$status='down';
 $X='93763';
 $Y='464042';
 
-$LOKATIE='IP69 kast aan antennemast, PoE vanuit voorkamer en meterkast.';
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap
+TYPE=wireless
+IP=$master_ip/26
+DESC=AP
+SDESC=ap
+DHCP=10-60
+MODE=master
+ESSID=ap-WirelessLeiden-Rund
+CHANNEL=3
+# Channel 6 - local network, 9,10,11 
+# private networks at adjacent houses.
+ATH0
 
-$config{'sis0'}=sprintf <<ED0;
+$config{'vr0'}=sprintf <<VR0;
 COMMENT=Ethernet
 TYPE=ethernet
 STATUS=up
 IP=172.17.160.65/28
-
 # Link to the cisco downstairs does not reliably
 # auto negotiate at 100Mbit/full duplex; so force
 # the speed down a wee bit.
 MEDIA=10baseT/UTP
-
 DESC=Ethernet naar HCC
 SDESC=2dirkx
 DHCP=no
-ED0
+VR0
 
-$config{'wi0'}=sprintf <<EOM;
-COMMENT=AP NW
-TYPE=wireless
-IP=$master_ip/26
-DESC=Omni voor de buurt
-SDESC=omni
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=Link naar vosko2
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+STATUS=up
+IP= 172.16.17.156/29
+DESC=link naar vosko2
+SDESC=2vosko2
+DHCP=no
+MODE=bridge station wds
+ESSID=il-no.vosko2.wleiden.net
+CHANNEL=44
+NSMAC=00:15:6D:70:
+NSIP=172.16.17.155/29
+VR1
 
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=Link naar 
+TYPE=ethernet
+STATUS=down
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.5.91/29
+DESC=Link naar xxxx
+SDESC=2xxx
+DHCP=no
+MODE=bridge station
+ESSID=xxxx
+CHANNEL=xxx
+NSIP=172.16.5.90/29
+NSMAC=00:15:6D:70:54:52
+VR2
 
-DHCP=no
-DHCP=10-60
-
-MODE=master
-ESSID=ap-omni.rund.wleiden.net
-# Channel 6 - local network, 9,10,11 
-# private networks at adjacent houses.
-# Link Cope: 5, CetimNW 1
-CHANNEL=3
-
-
-EOM
-
-$config{'wi2'}=sprintf <<EOM;
-COMMENT=Link naar vosko2
-TYPE=wireless
-IP=172.16.0.177/30
-DESC=Link naar Vosko2
-SDESC=2vosko2
-
-
-MODE=managed
-ESSID=il-no.vosko2.wleiden.net
-
-CHANNEL=13
-
-
-DHCP=no
-EOM
-
-
-$config{'wi1'}=sprintf <<EOM;
-TYPE=wireless
-IP=172.16.0.182/30
-DESC=Link naar CeTIM3
-SDESC=2cetim3
-
-
-MODE=managed
-ESSID=il-nw.cetim3.wleiden.net
-CHANNEL=9
-
-
-DHCP=no
-EOM
-
-