Index: /nodes/CNodeBroekplein/wleiden.conf
===================================================================
--- /nodes/CNodeBroekplein/wleiden.conf	(revision 8046)
+++ /nodes/CNodeBroekplein/wleiden.conf	(revision 8047)
@@ -1,4 +1,2 @@
-#
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeBroekplein
@@ -8,93 +6,65 @@
 $nodetype='CNode';
 $nodename='Broekplein';
-$release="5.0-RELEASE";
-
-
+$release="8.0-RELEASE";
 $status='up';
-
-
-# edugis x,y 94475,466097
 $X='94475';
 $Y='466097';
 
-$config{'ep0'}=sprintf <<ED0;  # Ethernet
+$config{'ath0'}=sprintf <<ATH0; # AP omni
+TYPE=wireless
+IP=$master_ip/26
+DESC=AP voor de buurt
+SDESC=ap
+DHCP=10-60
+MODE=master
+ESSID=ap-WirelessLeiden-Broekplein
+CHANNEL=4
+ATH0
+
+
+$config{'ue0'}=sprintf <<UE0;  # Ethernet
 TYPE=ethernet
 IP=172.21.144.65/28
-
 DESC=Ethernet naar tweemaster
 SDESC=eth
+DHCP=70-78
+UE0
 
-DHCP=70-78
-
-
-ED0
-
-
-$config{'wi0'}=sprintf <<EW0; # AP omni
-TYPE=wireless
-IP=$master_ip/26
-
-DESC=omni voor de buurt
-SDESC=omni
-
-DHCP=10-60
-
-
-MODE=master
-ESSID=ap-omni.broekplein.wleiden.net
-CHANNEL=4
-
-
-EW0
-
-
-$config{'wi1'}=sprintf <<EW1; 
-TYPE=wireless
+$config{'vr0'}=sprintf <<VR0; # a-link naar SOM via Nanostation5
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
 IP=172.16.1.50/30
+DHCP=no
 DESC=Link naar SOM
 SDESC=2som
+#MODE=managed
+#ESSID=il-n.som1.wleiden.net
+#CHANNEL=132
+#NSMAC=
+VR0
 
+$config{'vr1'}=sprintf <<VR1; # link naar Rosmolen
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+DESC=Link naar Rosmolen
+SDESC=2rosmolen
+IP=172.16.0.210/30
+DHCP=no
+#MODE=ap
+#ESSID=il-z.broekplein.wleiden.net
+#CHANNEL=36
+#NSMAC=
+VR1
 
-MODE=managed
-ESSID=il-nw.som.wleiden.net
-
-#CHANNEL=11
-
-
+$config{'vr2'}=sprintf <<VR2; # link naar Lijtweg
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.1.58/30
 DHCP=no
-
-EW1
-
-$config{'wi2'}=sprintf <<EW2;
-TYPE=wireless
-DESC=Link naar Rosmomolen
-SDESC=2rosmolen
-
-IP=172.16.0.210/30
-
-DHCP=no
-
-MODE=managed
-ESSID=il-nw.rosmolen.wleiden.net
-
-#CHANNEL=7
-EW2
-
-
-
-
-$config{'wi3'}=sprintf <<EW3;  # link naar Lijtweg1 
-TYPE=wireless
-IP=172.16.1.58/30
 DESC=Link naar Lijtweg 
 SDESC=2lijtweg1
-
-DHCP=no
-
-MODE=managed
-ESSID=il-o.lijtweg1.wleiden.net
-
-#CHANNEL=1
-
-
-EW3
+#MODE=ap
+#ESSID=il-w.broekplein.wleiden.net
+#CHANNEL=44
+#NSMAC=
+VR2