Index: /nodes/CNodeGraficall/wleiden.conf
===================================================================
--- /nodes/CNodeGraficall/wleiden.conf	(revision 7931)
+++ /nodes/CNodeGraficall/wleiden.conf	(revision 7932)
@@ -1,26 +1,25 @@
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeGraficall
-
 $location="Zusterflat Ziekenhuis Rijnland, Simon Smitweg 1, 2353 GA, Leiderdorp";
-
 $master_ip='172.24.16.1';
 $nodetype='CNode';
 $nodename='Graficall';
-
+$release="8.0-RELEASE";
 $status='up';
-
-$release="6.0-STABLE";
-
-
-# edugis x,y  97110,463425
 $X='97110';
 $Y='463425';
 
-#edugis x,y  97110,463425
+$config{'ath0'}=sprintf <<ATH0;  # omni
+TYPE=wireless
+IP=$master_ip/26
+DESC=AP voor de buurt
+SDESC=ap
+DHCP=10-60
+MODE=master
+ESSID=ap-WirelessLeiden-Graficall
+CHANNEL=1
+ATH0
 
-$config{'ep0'}=sprintf <<EP0;  # b-link to Hoogmade via Bullet2
+$config{'ue0'}=sprintf <<UE0;  # b-link to Hoogmade via Bullet2
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -28,5 +27,4 @@
 DESC=Link naar HMKerk2 
 SDESC=2hmkerk2
-
 #MODE=master
 #ESSID=il-n.graficall.wleiden.net
@@ -34,8 +32,7 @@
 HEIGHT=17
 DHCP=no
+UE0
 
-EP0
-
-$config{'ep0:0'}=sprintf <<EP00;
+$config{'ue0:0'}=sprintf <<UE00;
 TYPE=ethernet
 IP=172.16.3.141/30
@@ -43,18 +40,20 @@
 SDESC=manageBullet
 DHCP=no
-EP00
+UE00
 
-$config{'ep1'}=sprintf <<EP1; # a-link to Leythenrode via Nanostation5
+$config{'vr0'}=sprintf <<VR0; # a-link to Leythenrode via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
 IP=172.16.3.78/30
-DESC=Ethernet to interlink northeast of leythenrode
+DESC=Ethernet to interlink northeast of Leythenrode
 SDESC=2Leythenrode
-MODE=managed
-ESSID=il-no.leythenrode.wleiden.net
+DHCP=no
+#MODE=managed bridge
+#ESSID=il-no.leythenrode.wleiden.net
 #CHANNEL=52
-EP1
+#NSMAC=00:15:6D:EA:F0:4C
+VR0
 
-$config{'ep1:0'}=sprintf <<EP10;
+$config{'vr0:0'}=sprintf <<VR00;
 TYPE=ethernet
 IP=172.16.3.137/30
@@ -62,52 +61,30 @@
 SDESC=manageNS
 DHCP=no
-EP10
+VR00
 
-$config{'wi0'}=sprintf <<EW0;  # omni
-TYPE=wireless
-IP=$master_ip/26
+$config{'vr1'}=sprintf <<VR1;
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.0.242/30
+DESC=Link JVC
+SDESC=2jvc
+DHCP=no
+#MODE=11a bridge ap
+#ESSID=il-zw.graficall.wleiden.net
+#CHANNEL=36
+#NSMAC=00:15:6D:EB:F0:68
+VR1
 
-DESC=omni
-SDESC=no
+$config{'vr2'}=sprintf <<VR2;
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.1.69/30
+DESC=Link naar SOM
+SDESC=2som
+DHCP=no
+#MODE=11a bridge ap
+#ESSID=il-nw.graficall.wleiden.net
+#CHANNEL=60
+#NSMAC= 00:15:6D:EB:F0:F8
+VR2
 
-DHCP=10-60
-
-
-MODE=master
-ESSID=ap-omni.graficall.wleiden.net
-CHANNEL=1
-
-
-EW0
-
-
-$config{'wi1'}=sprintf <<EW1;
-TYPE=wireless
-IP=172.16.0.242/30
-DESC=Link Roomburgh1
-SDESC=2roomburgh1
-
-MODE=managed
-ESSID=il-no.roomburgh1.wleiden.net
-
-
-DHCP=no
-
-EW1
-
-$config{'wi2'}=sprintf <<EW2;
-TYPE=wireless
-IP=172.16.1.69/30
-DESC=Link naar Zijloever
-SDESC=2zijloever
-
-
-MODE=master
-ESSID=il-nw.graficall.wleiden.net
-
-CHANNEL=8
-
-
-DHCP=no
-
-EW2
Index: /nodes/CNodeLeythenrode/wleiden.conf
===================================================================
--- /nodes/CNodeLeythenrode/wleiden.conf	(revision 7931)
+++ /nodes/CNodeLeythenrode/wleiden.conf	(revision 7932)
@@ -1,2 +1,3 @@
+#
 # config CNodeLeythenrode
 $location="Verpleeghuis Leythenrode, Hoogmadeseweg 55, 2351 CP, Leiderdorp";
@@ -4,13 +5,21 @@
 $nodetype='CNode';
 $nodename='Leythenrode';
-$status='planned';
-$release="7.2-RELEASE";
-
-
-#edugis x,y  96728,463407
+$status='up';
+$release="8.0-RELEASE";
 $X='96728';
 $Y='463407';
 
-$config{'vr0'}=sprintf <<VR0;  # ethernet to local subnet with PoE
+$config{'ath0'}=sprintf <<ATH0;  # Ap voor buurt
+TYPE=wireless
+IP=$master_ip/26
+DESC=AP voor de buurt
+SDESC=ap
+DHCP=10-60
+MODE=master
+ESSID=ap-WirelessLeiden-Leythenrode
+CHANNEL=9
+ATH0
+
+$config{'ue0'}=sprintf <<UE0;  # ethernet to local subnet with PoE
 IP=172.17.0.2/24
 DESC=local ethernet with proxy7 and local clients (ap's bridge)
@@ -18,5 +27,5 @@
 DHCP=no
 TYPE=ethernet
-VR0
+UE0
 
 #configuration of local AP's
@@ -46,9 +55,21 @@
 #CHANNEL=8
 
-$config{'vr1'}=sprintf <<VR1; # a-link to Graficall via Nanostation5
+$config{'vr0'}=sprintf <<VR0; # a-link naar AA24
+TYPE=ethernet
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.4.61/30
+DESC=Ethernet naar interlink zuidoost (AA24)
+SDESC=2AA24
+#MODE=master
+#ESSID=il-zo.leythenrode.wleiden.net
+#CHANNEL=100
+#NSMAC=00:15:6D:EB:F1:33
+VR0
+
+$config{'vr1'}=sprintf <<VR1; # a-link naar Graficall via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
 IP=172.16.3.77/30
-DESC=Ethernet to interlink northeast (graficall)
+DESC=Ethernet naar interlink noordoost (graficall)
 SDESC=2Graficall
 MODE=master
@@ -70,5 +91,5 @@
 EXTRA_TYPE=eth2wifibridge
 IP=172.16.3.101/30
-DESC=ethernet to interlink zuidwest (Roomburgh3)
+DESC=ethernet naar interlink zuidwest (Roomburgh3)
 SDESC=2DeClercq
 MODE=master
@@ -83,16 +104,2 @@
 SDESC=manageNS3
 VR20
-
-
-$config{'ath0'}=sprintf <<ATH0;  # Ap voor buurt
-TYPE=wireless
-IP=$master_ip/26
-DESC=AP voor de buurt
-SDESC=ap
-DHCP=10-60
-MODE=master
-ESSID=omni.leythenrode.wleiden.net
-CHANNEL=2
-CARD_OPTION=mode 11b
-ATH0
-