Index: nodes/CNodeCeTIM1/wleiden.conf
===================================================================
--- nodes/CNodeCeTIM1/wleiden.conf	(revision 7861)
+++ nodes/CNodeCeTIM1/wleiden.conf	(revision 7874)
@@ -1,6 +1,3 @@
-#
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
+
 #
 # config CNodeCeTIM1
@@ -11,19 +8,28 @@
 $nodename='CeTIM1';
 $release="8.0-RELEASE";
-$DISK='FLASH';
 $status='up';
 $X='93894';
 $Y='463704';
-$AGGREGATE=23;
 
-$config{'sis1'}=sprintf <<SIS1;  # Ethernet
+$config{'ath0'}=sprintf <<ATH0;  # ap's NO
+TYPE=wireless
+IP=172.17.136.1/24
+DESC=CeTIM richting NO
+SDESC=no
+DHCP=10-250
+MODE=master
+ESSID=ap-WirelessLeiden-CeTIM1
+CHANNEL=3
+ATH0
+
+$config{'vr1'}=sprintf <<VR1;  # Ethernet naar proxy2
 TYPE=ethernet
 IP=172.17.143.1/28
-DESC=Ethernet naar kerkvloer
-SDESC=eth
+DESC=Ethernet naar proxy2
+SDESC=2proxy2
 DHCP=no
-SIS1
+VR1
 
-$config{'sis1:0'}=sprintf <<SIS10;  # Ethernet
+$config{'vr2'}=sprintf <<VR2;  # Ethernet naar CeTIM2
 TYPE=ethernet
 IP=172.16.0.33/30                                                        
@@ -31,38 +37,46 @@
 SDESC=2cetim2
 DHCP=no                                                                
-SIS10
+VR2
                                                                                 
-$config{'sis1:1'}=sprintf <<SIS11;  # Ethernet
+$config{'vr3'}=sprintf <<VR3;  # a-link Nanostation5 Noord-Oost
 TYPE=ethernet
-IP=172.31.255.4/28
-DESC=Link naar Proxy2
-SDESC=2proxy2
+EXTRA_TYPE=eth2wifibridge
+IP=172.31.255.3/28
+DESC=CeTIM richting NO
+SDESC=NScetim1-n
 DHCP=no
-SIS11
+#ESSID=il-no.cetim1.wleiden.net
+#CHANNEL=
+#mode 11a bridge master
+VR3
+
+$config{'vr3:0'}=sprintf <<VR30;  # a-link Houtmarkt
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.0.41/30
+DESC=a-Link naar Houtmarkt
+SDESC=a2houtmarkt
+VR30
+
+$config{'vr3:1'}=sprintf <<VR31;  # a-link Spoortje
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.8.29/30
+DESC=a-Link naar Spoortje
+SDESC=a2spoortje
+VR31
+    
+$config{'ue0'}=sprintf <<UE0;  # a-link Nanostation5 Zuid-Oost
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.0.193/30
+DESC=interlink 2roomburgh1
+SDESC=2roomburgh1
+DHCP=no
+#ESSID=il-zo.cetim1.wleiden.net
+#CHANNEL=
+#mode 11a bridge master                                                                       
+UE0
                                                                                 
-$config{'sis1:2'}=sprintf <<SIS12;  # Ethernet
-TYPE=ethernet
-IP=172.16.0.53/30                                                                   
-DESC=Ethernet naar cetim3
-SDESC=2cetim3
-DHCP=no                                                                       
-SIS12
-                                                                                
-
-
-
-$config{'wi0'}=sprintf <<EW0;  # APs NO
-TYPE=wireless
-IP=172.17.136.1/24
-
-DESC=CeTIM richting NO
-SDESC=no
-
-DHCP=10-250
-
-
-MODE=master
-ESSID=ap-no.cetim1.wleiden.net
-CHANNEL=1
 
 
@@ -70,29 +84,2 @@
 
 
-EW0
-
-
-$config{'wi1'}=sprintf <<EW1;  # APs ZW
-TYPE=wireless
-IP=172.17.137.1/24
-
-DESC=CeTIM richting ZW
-SDESC=zw
-
-DHCP=10-250
-
-
-
-
-MODE=master
-ESSID=ap-zw.cetim1.wleiden.net
-CHANNEL=11
-
-
-
-
-
-EW1
-
-
-
Index: nodes/CNodeCeTIM2/wleiden.conf
===================================================================
--- nodes/CNodeCeTIM2/wleiden.conf	(revision 7861)
+++ nodes/CNodeCeTIM2/wleiden.conf	(revision 7874)
@@ -1,3 +1,3 @@
-#  Read by /usr/local/sbin/wireless-up.pl
+# Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeCeTIM2
@@ -7,19 +7,28 @@
 $nodename='CeTIM2';
 $release="8.0-RELEASE";
-$DISK='FLASH';
 $status='up';
 $X='93894';
 $Y='463704';
-$AGGREGATE=24;
 
-$config{'sis1'}=sprintf <<sis1;  # Ethernet
-TYPE=ethernet
-IP=172.17.143.2/28
-DESC=Ethernet naar kerkvloer
-SDESC=eth
+$config{'ath0'}=sprintf <<ATH0;  # APs ZW
+TYPE=wireless
+IP=172.17.137.1/24
+DESC=CeTIM AP richting ZW
+SDESC=zw
+DHCP=10-250
+MODE=master
+ESSID=ap-WirelessLeiden-CeTIM2
+CHANNEL=9
+ATH0
+
+$config{'ath0:1'}=sprintf <<ATH01;  # link naar Burcht
+TYPE=wireless
+IP=172.16.0.105/30
+DESC=Link naar Burcht
+SDESC=2burcht
 DHCP=no
-sis1
+ATH01
 
-$config{'sis1:0'}=sprintf <<sis10;  # Ethernet
+$config{'vr0'}=sprintf <<VR0;  # Ethernet naar CeTIM1
 TYPE=ethernet
 IP=172.16.0.34/30
@@ -27,92 +36,89 @@
 SDESC=2cetim1
 DHCP=no
-sis10
+VR0
 
-$config{'sis1:1'}=sprintf <<sis11;  # Ethernet
+$config{'vr1'}=sprintf <<VR1;  # Ethernet naar lokaal AP
 TYPE=ethernet
-IP=172.31.255.2/28
-DESC=Link naar Proxy2
-SDESC=2proxy2
-DHCP=no
-sis11
+EXTRA_TYPE=eth2wifibridge
+IP=172.17.139.1/24
+DESC=CeTIM lokaal AP
+SDESC=lokaalAP
+DHCP=10-250
+#Nanostation2-loco
+#ESSID=ap-WirelessLeiden-HooglandseKerk
+#CHANNEL=6
+#mode 11b bridge master
+VR1
 
-$config{'sis1:2'}=sprintf <<sis12;  # Ethernet
+$config{'vr2'}=sprintf <<VR2;  #Interlinks ZW
 TYPE=ethernet
-IP=172.16.0.57/30
-DESC=Link naar cetim3
-SDESC=2cetim3
-DHCP=no
-sis12
-
-$config{'wi0'}=sprintf <<EW0;  #Interlinks NO
-TYPE=wireless
-IP=172.17.139.1/24
-DESC=CeTIM richting NO
-SDESC=no
-DHCP=no
-MODE=master
-ESSID=il-no.cetim2.wleiden.net
-CHANNEL=10
-EW0
-
-$config{'wi0:0'}=sprintf <<EW00;  # link naar Houtmarkt 
-TYPE=wireless
-IP=172.16.0.41/30
-DESC=Link naar Houtmarkt
-SDESC=2houtmarkt
-DHCP=no
-EW00
-
-$config{'wi0:1'}=sprintf <<EW01;
-TYPE=wireless
-DESC=Link naar Spoortje
-SDESC=2spoortje
-IP=172.16.8.29/30
-DHCP=no
-EW01
-
-$config{'wi0:2'}=sprintf <<EW02; # link naar Xant
-TYPE=wireless
-DESC=Link naar Xant
-SDESC=2xant
-IP=172.16.3.93/30
-DHCP=no
-EW02
-
-$config{'wi1'}=sprintf <<EW1;  #Interlinks ZW
-TYPE=wireless
+EXTRA_TYPE=eth2wifibridge
 IP=172.16.5.2/30
 DESC=Link to IMI
 SDESC=2imi
 DHCP=no
-MODE=master
-ESSID=il-zw.cetim2.wleiden.net
-CHANNEL=11
-EW1
+#MODE=11a bridge master
+#ESSID=il-zw.cetim2.wleiden.net
+#CHANNEL=
+VR2
 
-$config{'wi1:0'}=sprintf <<EW10;  # link naar Lvl-z
-TYPE=wireless
+$config{'vr2:0'}=sprintf <<VR20;  # link naar Lvl-z
+TYPE=ethernet
 IP=172.16.0.77/30
 DESC=Link naar LvLz
 SDESC=2lvlz
 DHCP=no
-EW10
+VR20
 
-$config{'wi1:1'}=sprintf <<WI11;  # link naar RV
-TYPE=wireless
+$config{'vr2:1'}=sprintf <<VR21;  # link naar RV
+TYPE=ethernet
 IP=172.16.0.133/30
 DESC=Link naar RenV
 SDESC=2rv
 DHCP=no
-WI11
+VR21
 
-$config{'wi1:2'}=sprintf <<WI12;  # link naar Huub
-TYPE=wireless
+$config{'vr2:2'}=sprintf <<VR22;  # link naar Huub
+TYPE=ethernet
 IP=172.16.1.37/30
 DESC=Link naar Huub
 SDESC=2huub
 DHCP=no
-WI12
+VR22
 
+$config{'ue0'}=sprintf <<UE0;  # a-link Nanostation5 Noord-West
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.0.73/30
+DESC=Link to LvLn
+SDESC=2lvln
+DHCP=no
+#ESSID=il-nw.cetim2.wleiden.net
+#CHANNEL=
+#mode 11a bridge master                                                                       
+UE0
 
+$config{'ue0:1'}=sprintf <<UE01;  # link naar OB
+TYPE=ethernet
+IP=172.16.0.161/30
+DESC=Link naar OB
+SDESC=2ob
+DHCP=no
+UE01
 
+$config{'ue0:2'}=sprintf <<UE02;  # link naar Rabo
+TYPE=ethernet
+IP=172.16.0.57/30
+DESC=Link naarRabo
+SDESC=2rabo
+DHCP=no
+UE02
+
+$config{'ue0:3'}=sprintf <<UE03;  # link naar Rund
+TYPE=ethernet
+IP=172.16.0.181/30
+DESC=Link naar Rund
+SDESC=2rund
+DHCP=no
+UE03
+
Index: nodes/CNodeCeTIM3/wleiden.conf
===================================================================
--- nodes/CNodeCeTIM3/wleiden.conf	(revision 7861)
+++ 	(revision )
@@ -1,110 +1,0 @@
-#
-#  Read by /usr/local/sbin/wireless-up.pl
-#
-# config CNodeCeTIM3
-$location="Hooglandse Kerk, Middelweg 2, 2312 KG, Leiden";
-$master_ip='172.17.143.3';  
-$nodetype='CNode';
-$nodename='CeTIM3';
-$release="8.0-RELEASE";
-$DISK='FLASH';
-$status='up';
-$X='93894';
-$Y='463704';
-$AGGREGATE=24;
-
-$config{'sis1'}=sprintf <<sis1;  # Ethernet
-TYPE=ethernet
-IP=172.17.143.3/28
-DESC=Ethernet naar kerkvloer
-SDESC=2cetim
-DHCP=no
-sis1
-
-$config{'sis1:0'}=sprintf <<sis10;  # Ethernet
-TYPE=ethernet
-IP=172.16.0.54/30
-DESC=Link naar cetim1
-SDESC=2cetim1
-DHCP=no
-sis10
-
-$config{'sis1:1'}=sprintf <<sis11;  # Ethernet
-TYPE=ethernet
-IP=172.31.255.3/28
-DESC=Link naar Proxy2
-SDESC=2proxy2
-DHCP=no
-sis11
-
-$config{'sis1:2'}=sprintf <<sis12;  # Ethernet
-TYPE=ethernet
-IP=172.16.0.58/30
-DESC=Link naar cetim2
-SDESC=2cetim2
-DHCP=no
-sis12
-
-$config{'wi0'}=sprintf <<EW;  #Interlinks NW
-TYPE=wireless
-IP=172.16.0.73/30
-DESC=Link to LvLn
-SDESC=2lvln
-DHCP=no
-MODE=master
-ESSID=il-nw.cetim3.wleiden.net
-CHANNEL=1
-EW
-
-#$config{'wi0:3'}=sprintf <<EW03;  # link naar Rabo
-#TYPE=wireless
-#IP=172.16.0.97/30
-#DESC=Link naar Rabo
-#SDESC=2rabo
-#DHCP=no
-#EW03
-
-#$config{'wi0:4'}=sprintf <<EW04;  # link naar Cope
-#TYPE=wireless
-#IP=172.16.0.25/30
-#DESC=Link naar Cope
-#SDESC=2cope
-#
-#DHCP=no
-#
-#EW04
-
-$config{'wi0:0'}=sprintf <<EW00;  # link naar OblC
-TYPE=wireless
-IP=172.16.0.161/30
-DESC=Link naar OblC
-SDESC=2oblc
-DHCP=no
-EW00
-
-$config{'wi0:1'}=sprintf <<EW01;
-TYPE=wireless
-IP=172.16.0.181/30
-DESC=Link naar Rund
-SDESC=2rund
-DHCP=no
-EW01
-
-$config{'wi0:2'}=sprintf <<EW02;  # link naar Burcht
-TYPE=wireless
-IP=172.16.0.105/30
-DESC=Link naar Burcht
-SDESC=2burcht
-DHCP=no
-EW02
-
-$config{'wi1'}=sprintf <<EW1;  # interlink roomburgh1
-TYPE=wireless
-IP=172.16.0.193/30
-DESC=interlink 2roomburgh1
-SDESC=2roomburgh1
-DHCP=no
-MODE=master
-ESSID=il-zo.cetim3.wleiden.net
-CHANNEL=5
-EW1