Index: nodes/CNodeHoutmarkt/wleiden.conf
===================================================================
--- nodes/CNodeHoutmarkt/wleiden.conf	(revision 8521)
+++ nodes/CNodeHoutmarkt/wleiden.conf	(revision 9075)
@@ -1,111 +1,84 @@
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeHoutmarkt
-
 $location="Speciale Basisschool Vuurvogel, Houtmarkt 36, 2312 PZ, Leiden";
 $master_ip='172.19.8.1';
 $nodetype='CNode';
 $nodename='Houtmarkt';
-$release="5.0-RELEASE";
-
-
+$release="8.2-RELEASE";
 $status='up';
-
 $X='94200';
 $Y='464302';
 
-$config{'ep0'}=sprintf <<ED0;
+$config{'ue0'}=sprintf <<UE0;
 COMMENT=Ethernet
 TYPE=ethernet
 STATUS=up
 IP=172.19.8.65/28
-
-
 DESC=Ethernet naar tweemaster
 SDESC=eth
+DHCP=66-78
+UE0
 
-DHCP=66-78
-
-
-
-ED0
-
-
-$config{'wi0'}=sprintf <<EW;
-COMMENT=Omni
+$config{'ath0'}=sprintf <<ATH0;
+COMMENT=ap
 TYPE=wireless
 IP=$master_ip/26
 DESC=omni voor de buurt
-SDESC=omni
+SDESC=ap
+DHCP=10-60
+MODE=master
+ESSID=ap-WirelessLeiden-Houtmarkt
+CHANNEL=3
+ATH0
 
-DHCP=10-60
+$config{'vr0'}=sprintf <<VR0;
+COMMENT=link naar Som1
+TYPE=ethernet
+STATUS=up
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.0.50/30
+DESC=bridge naar Som1
+SDESC=2som1
+DHCP=no
+ESSID=il-z.som1.wleiden.net
+#CHANNEL=52
+#mode 11a bridge station
+NSIP=
+NSMAC=
+VR0
 
+$config{'vr1'}=sprintf <<VR1;
+COMMENT=a-link naar Cetim1
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+STATUS=down
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.0.42/30
+DESC=naar CeTIM1 richting ZW
+SDESC=ncetim1
+DHCP=no
+ESSID=il-no.cetim1.wleiden.net
+NSIP=
+NSMAC=
+#CHANNEL=140
+#mode 11a bridge station
+VR1
 
-MODE=master
-ESSID=ap-omni.houtmarkt.wleiden.net
-CHANNEL=1
-
-
-EW
-
-$config{'wi1'}=sprintf <<EW;
-COMMENT=active test AP
+$config{'vr2'}=sprintf <<VR2;
+COMMENT=extra AP
 TYPE=wireless
-IP=172.19.8.81/30
-DESC=TestAp
-SDESC=2locatie
-
-
-MODE=master
-ESSID=il-test.houtmarkt.wleiden.net
-
-
-DHCP=no
-
-EW
-
-$config{'wi2'}=sprintf <<EW;
-COMMENT=link naar Cetim2 
-TYPE=wireless
-IP=172.16.0.42/30
-DESC=Link naar Cetim2
-SDESC=2Cetim2
-
-
-DHCP=no
-
-MODE=managed
-ESSID=il-no.cetim2.wleiden.net
-
-CHANNEL=10
-
-
-DHCP=no
-
-EW
-
-$config{'wi3'}=sprintf <<EW;
-COMMENT=link naar Som 
-TYPE=wireless
-IP=172.16.0.50/30
-
-DESC=2som
-SDESC=2som
-
-
-DHCP=no
-
-
-MODE=managed
-ESSID=il-z.som.wleiden.net
-CHANNEL=5
-
-
-EW
+STATUS=up
+EXTRA_TYPE=eth2wifibridge
+IP=172.19.8.129/26
+DESC=Extra-Ap
+SDESC=ap2
+MODE=ap-bridge
+ESSID=ap-WirelessLeiden-Houtmarkt2
+DHCP=140-190
+BulletIP=172.19.8.130/29
+BulletMAC=
+VR2
 
 
 
 
-