Index: nodes/CNodeIMI/wleiden.conf
===================================================================
--- nodes/CNodeIMI/wleiden.conf	(revision 7987)
+++ nodes/CNodeIMI/wleiden.conf	(revision 7988)
@@ -1,3 +1,2 @@
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeImi
@@ -6,102 +5,80 @@
 $nodetype='CNode';
 $nodename='IMI';
-$release="5.0-RELEASE";
-
-
+$release="8.0-RELEASE";
 $status='up';
-
-# edugis x,y 93412,463311
 $X='93412';
 $Y='463311';
 
-$config{'ep0'}=sprintf <<ED0;  # OMNI
+$config{'ath0'}=sprintf <<ATH0;  # ap 
+TYPE=wireless
+IP=$master_ip/26
+DESC=AP voor de buurt
+SDESC=ap
+DHCP=10-60
+MODE=master
+ESSID=ap-WirelessLeiden-IMI
+CHANNEL=10
+ATH0
+
+$config{'vr0'}=sprintf <<VR0;  # link naar RijnVliet
 TYPE=ethernet
-IP=172.17.24.65/29
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.3.93/30
+DHCP=no
+DESC=Link naar rijnvliet
+SDESC=2rijnvliet
+#MODE=managed
+#ESSID=il-no.rv.wleiden.net
+#CHANNEL=60
+#NSMAC=00:15:6D:E9:F9:B0
+VR0
 
-DESC=Ethernet naar GAL
-SDESC=eth
+$config{'vr1'}=sprintf <<VR1; # link naar CeTIM
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.5.1/30
+DHCP=no
+DESC=Link naar CeTIM2
+SDESC=2cetim2
+#MODE=managed
+#ESSID=il-zw.cetim2.wleiden.net
+#CHANNEL=116
+#NSMAC=00:15:6D:
+VR1
 
-#DHCP=68-70
+$config{'vr2'}=sprintf <<VR2;  # b-link naar Grip
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.0.249/30
 DHCP=no
+DESC=b-Link naar Grip
+SDESC=b2grip
+#MODE=bridge ap
+#ESSID=il-zo.imi.wleiden.net
+#CHANNEL=4
+#BulletMAC=00:15:6D:ED:82:40
+VR2
+
+$config{'ue0'}=sprintf <<UE0; # Link naar Thomas
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.0.81/30
+DESC=Link naar Thomas
+SDESC=2thomas
+MODE=master
+ESSID=il-no.imi.wleiden.net
+CHANNEL=7
+DHCP=no
+UE0
+
+$config{'ue0:0'}=sprintf <<UE00; Link naar LvLz
+TYPE=wireless
+IP=172.16.0.37/30
+DESC=Link naar LvLz
+SDESC=2lvlz
+DHCP=no
+UE00
 
 
 
 
-ED0
-
-$config{'wi0'}=sprintf <<EW0;  # OMNI
-TYPE=wireless
-IP=$master_ip/26
-
-DESC=Omni voor de buurt
-SDESC=omni
-
-DHCP=10-60
-
-
-MODE=master
-ESSID=ap-omni.imi.wleiden.net
-CHANNEL=1
-
-
-EW0
-
-$config{'wi1'}=sprintf <<EW1;
-TYPE=wireless
-IP=172.16.5.1/30
-DESC=Link naar CeTIM2
-SDESC=2cetim2
-
-MODE=managed
-ESSID=il-zw.cetim2.wleiden.net
-
-DHCP=no
-
-EW1
-
-$config{'wi2'}=sprintf <<EW2;
-TYPE=wireless
-IP=172.16.0.81/30
-DESC=Link naar Thomas
-SDESC=2thomas
-
-
-MODE=master
-ESSID=il-no.imi.wleiden.net
-CHANNEL=8
-
-
-DHCP=no
-
-EW2
-
-$config{'wi2:0'}=sprintf <<EW20;
-TYPE=wireless
-IP=172.16.0.37/30
-DESC=Link naar LvLz
-SDESC=2lvlz
-
-
-
-DHCP=no
-
-EW20
-
-
-$config{'wi3'}=sprintf <<EW3;
-TYPE=wireless
-IP=172.16.0.249/30
-DESC=Link naar Grip
-SDESC=2grip
-
-
-MODE=master
-ESSID=il-zo.imi.wleiden.net
-CHANNEL=4
-
-
-DHCP=no
-
-EW3
-
-