Index: nodes/CNodeCeTIM2/wleiden.conf
===================================================================
--- nodes/CNodeCeTIM2/wleiden.conf	(revision 7657)
+++ 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
+