Index: /nodes/CNodeCeTIM1/wleiden.conf
===================================================================
--- /nodes/CNodeCeTIM1/wleiden.conf	(revision 9479)
+++ /nodes/CNodeCeTIM1/wleiden.conf	(revision 9480)
@@ -61,13 +61,12 @@
 VR2
   
-$config{'vr2:0'}=sprintf <<VR20;
-COMMENT=a-link watertoren
+$config{'vr2:0'}=sprintf <<EOT;
 TYPE=ethernet
 STATUS=up
 EXTRA_TYPE=eth2wifibridge
 IP=172.16.16.97/29
-DESC=a-Link naar Aalsmeer watertoren
+DESC=Tijdelijke Link naar Watertoren
 SDESC=2watertoren
-VR20
+EOT
  
 $config{'ue0'}=sprintf <<UE0;
Index: /nodes/CNodeDrijfhuis/wleiden.conf
===================================================================
--- /nodes/CNodeDrijfhuis/wleiden.conf	(revision 9479)
+++ /nodes/CNodeDrijfhuis/wleiden.conf	(revision 9480)
@@ -14,9 +14,8 @@
 
 $config{'vr0'}=sprintf <<EOT;
-COMMENT=nanostation naar amwatertoren1
 TYPE=ethernet
 STATUS=up
 IP=172.16.16.36/29
-DESC=Ethernet naar amwatertoren1
+DESC=Nanostation5 naar Watertoren
 SDESC=2watertoren
 DHCP=no
@@ -24,28 +23,26 @@
 ESSID=il-nw.watertoren1.wleiden.net
 CHANNEL=
-NSMAC=
+NSMAC=00:15:6D:70:50:04
 NSIP=172.16.16.35
 EOT
 
 $config{'vr1'}=sprintf <<EOT;
-COMMENT=nanostation naar schiphol
 TYPE=ethernet
 STATUS=down
-IP=172.16.16.161/29
-DESC=Ethernet naar schiphol
+IP=172.16.16.92/29
+DESC=Nanostation5 naar schiphol (UNUSED)
 SDESC=2schiphol
 DHCP=no
-MODE=managed bridge
+MODE=managed ap
 ESSID=il-zw.drijfhuis.wleiden.net
-CHANNEL=
-NSMAC=
-NSIP=172.16.16.162
+CHANNEL=36
+NSMAC=00:15:6D:70:4D:6D
+NSIP=172.16.16.91/29
 EOT
 
 $config{'ath0'}=sprintf <<EW0;
-COMMENT=OMNI voor Wifi op de Drijfhuis
 TYPE=wireless
 IP=$master_ip/26
-DESC=AP voor de buurt
+DESC=OMNI voor Wifi op de Drijfhuis
 SDESC=ap-omni
 DHCP=20-50
Index: /nodes/CNodeKaag2/wleiden.conf
===================================================================
--- /nodes/CNodeKaag2/wleiden.conf	(revision 9479)
+++ /nodes/CNodeKaag2/wleiden.conf	(revision 9480)
@@ -31,9 +31,9 @@
 IP=172.16.16.28/29
 DHCP=no
-DESC=Link naar Watertoren1
-SDESC=2watertoren1
+DESC=Link naar Watertoren3
+SDESC=2watertoren3
 MODE=station bridge
-ESSID=il-zw.watertoren1.wleiden.net
-CHANNEL=124
+ESSID=il-nw.watertoren3.wleiden.net
+CHANNEL=140
 NSMAC=00:15:6D:70:52:5D
 NSIP=172.16.16.27/29
Index: /nodes/CNodeLMkempers1/wleiden.conf
===================================================================
--- /nodes/CNodeLMkempers1/wleiden.conf	(revision 9479)
+++ /nodes/CNodeLMkempers1/wleiden.conf	(revision 9480)
@@ -4,89 +4,47 @@
 # config CNodeLMkempers1
 $location="Jachthaven Kempers, Herenweg 100, 2451 VS,  Leimuiden";
-$master_ip='172.25.80.65';
+$master_ip='172.25.80.1';
 $nodetype='CNode';
 $nodename='LMkempers1';
-$release="7.2-RELEASE";
+$release="8.2-RELEASE";
 
-
-$status='down';
+$status='up';
 
 $X='107020';
 $Y='471200';
 
-$AGGREGATE=22;
-
-$config{'sis0'}=sprintf <<ED0;
-COMMENT=ethernet
-STATUS=up poort 0 Soekris
+$config{'vr0'}=sprintf <<EOT;
+STATUS=up
+DESC=Ethernet Cross Connect
+SDESC=2kempers2
 TYPE=ethernet
 STATUS=up
-IP=$master_ip/29
+IP=172.16.16.65/29
+DHCP=no
+EOT
 
-DESC=Ethernet poort kempers1
-SDESC=eth
-
+$config{'vr1'}=sprintf <<EOT;
+TYPE=ethernet
+STATUS=up
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.16.140/29
+DESC=Nanostation5M naar Watertoren
+SDESC=2watertoren
 DHCP=no
+MODE=bridge ap
+ESSID=il-nw.watertoren3.wleiden.net
+NSIP=172.16.16.139/29
+NSMAC=00:27:22:10:FD:ED
+EOT
 
 
-ED0
-
-$config{'sis1'}=sprintf <<ED1;
-COMMENT=eth poort 1 naar node kempers2 
-TYPE=ethernet
-STATUS=up
-IP=172.16.1.201/30
-
-DESC=Ethernet naar kempers2
-SDESC=2lmkempers2
-
-DHCP=no
-
-
-
-ED1
-
-$config{'wi0'}=sprintf <<EW0;
-COMMENT=Link naar LMDorp 
+$config{'ath0'}=sprintf <<EW0;
 TYPE=wireless
-IP=172.16.1.193/30
-DESC=Link naar LMDorp 
-SDESC=2lmdorp
-
+IP=$master_ip/26
+DESC=OMNI voor Wifi op de westeinder
+SDESC=ap-omni
+DHCP=20-60
 MODE=master
-ESSID=il-zw.kmprs.wleiden.net
-CHANNEL=1
-
-DHCP=no
-
+ESSID=ap-Westeinder-Kempers1
+CHANNEL=8
 EW0
-
-$config{'wi0:0'}=sprintf <<EW00;
-COMMENT=link naar lmstruykverwo2
-TYPE=wireless
-IP=172.16.1.205/30
-
-DESC=Link naar lmstruykverwo2
-SDESC=2lmstruykverwo2
-
-
-
-DHCP=no
-
-EW00
-
-$config{'wi1'}=sprintf <<EW1;
-COMMENT=link kempers naar BDBoon
-TYPE=wireless
-IP=172.16.1.213/30
-DESC=Link naar BDBoon
-SDESC=2BDBoon
-
-
-MODE=master
-ESSID=il-zo.kmprs.wleiden.net
-CHANNEL=13
-
-DHCP=no
-
-EW1
Index: /nodes/CNodeLMkempers2/wleiden.conf
===================================================================
--- /nodes/CNodeLMkempers2/wleiden.conf	(revision 9479)
+++ /nodes/CNodeLMkempers2/wleiden.conf	(revision 9480)
@@ -2,77 +2,35 @@
 #  Read by /usr/local/sbin/wireless-up.pl
 #
-# config CNodeLMkempers2
+# config CNodeLMkempers1
 $location="Jachthaven Kempers, Herenweg 100, 2451 VS,  Leimuiden";
-
-$master_ip='172.25.84.1';
+$master_ip='172.17.15.1';
 $nodetype='CNode';
 $nodename='LMkempers2';
-$release="7.2-RELEASE";
+$release="8.2-RELEASE";
 
-
-$status='down';
+$status='up';
 
 $X='107020';
 $Y='471200';
 
-$config{'sis0'}=sprintf <<ED0;
-COMMENT=eth poort 0 Kempers2
+$config{'vr0'}=sprintf <<EOT;
+STATUS=up
+DESC=Ethernet Cross Connect
+SDESC=2kempers1
 TYPE=ethernet
 STATUS=up
-IP=172.25.84.65/29
-
-DESC=Ethernet naar Kempers2
-SDESC=eth
-
+IP=172.16.16.66/30
 DHCP=no
-
-ED0
-
-$config{'sis1'}=sprintf <<ED1;
-COMMENT=eth Link naar Kempers1
-TYPE=ethernet
-STATUS=up
-IP=172.16.1.202/30
-
-DESC=Ethernet naar lmkempers1
-SDESC=2lmkempers1
-
-DHCP=no
+EOT
 
 
-ED1
-
 $config{'ath0'}=sprintf <<EW0;
-COMMENT=OMNI voor Westeinder
 TYPE=wireless
 IP=$master_ip/26
-
-DESC=APKempers voor Westeinder
-SDESC=apkempers
-
-DHCP=10-60
-
+DESC=OMNI voor Wifi op de westeinder
+SDESC=ap-omni
+DHCP=20-60
 MODE=master
-ESSID=ap.we.wleiden.net
-CHANNEL=5
-
-
+ESSID=ap-Westeinder-Kempers2
+CHANNEL=4
 EW0
-
-$config{'wi0'}=sprintf <<EW1;
-COMMENT=Link naar AMWTR
-TYPE=wireless
-IP=172.16.1.209/30
-DESC=Link naar AMWTR
-SDESC=2amwtr
-
-MODE=master
-ESSID=il-no.kmprs.wleiden.net
-CHANNEL=5
-
-
-DHCP=no
-
-EW1
-
-
Index: /nodes/CNodeRecpark/wleiden.conf
===================================================================
--- /nodes/CNodeRecpark/wleiden.conf	(revision 9479)
+++ /nodes/CNodeRecpark/wleiden.conf	(revision 9480)
@@ -13,37 +13,36 @@
 $ileiden='yes';
 
+
 $config{'vr0'}=sprintf <<EOT;
-COMMENT=nanostation naar watertoren3
+TYPE=ethernet
+STATUS=down
+IP=172.16.16.225/29
+DESC=Nanostation5 naar Schiphol
+SDESC=2schiphol
+DHCP=no
+MODE=managed ap
+ESSID=il-no.recpark.wleiden.net
+CHANNEL=140
+NSMAC=00:15:6D:70:4D:75
+NSIP=172.16.16.226/29
+EOT
+
+
+$config{'vr1'}=sprintf <<EOT;
 TYPE=ethernet
 STATUS=up
-IP=172.16.16.140/29
-DESC=Ethernet naar watertoren3
+IP=172.16.16.76/29
+DESC=Nanostation5 naar Watertoren
 SDESC=2watertoren
 DHCP=no
 MODE=managed bridge
-ESSID=il-w.watertoren3.wleiden.net
+ESSID=il-zw.watertoren1.wleiden.net
 CHANNEL=
-NSMAC=
-NSIP=172.16.16.139
-EOT
-
-$config{'vr1'}=sprintf <<EOT;
-COMMENT=nanostation naar schiphol
-TYPE=ethernet
-STATUS=down
-IP=172.16.16.73/29
-DESC=Ethernet naar schiphol
-SDESC=2schiphol
-DHCP=no
-MODE=managed bridge
-ESSID=il-no.recpark.wleiden.net
-CHANNEL=
-NSMAC=
-NSIP=172.16.16.74
+NSMAC=00:15:6D:70:4D:A4
+NSIP=172.16.16.75/29
 EOT
 
 
 $config{'ath0'}=sprintf <<EW0;
-COMMENT=OMNI 
 TYPE=wireless
 IP=$master_ip/26
@@ -55,3 +54,2 @@
 CHANNEL=4
 EW0
-
Index: /nodes/CNodeUniGorN/wleiden.conf
===================================================================
--- /nodes/CNodeUniGorN/wleiden.conf	(revision 9479)
+++ /nodes/CNodeUniGorN/wleiden.conf	(revision 9480)
@@ -50,4 +50,13 @@
 DHCP=no
 UE00
+
+$config{'ue0:1'}=sprintf <<EOT;
+TYPE=ethernet
+STATUS=up
+IP=172.16.16.153/29
+DESC=Tijdelijke link naar Watertoren
+SDESC=2watertoren
+DHCP=no
+EOT
 
 $config{'vr0'}=sprintf <<VR0;
Index: /nodes/CNodeWatertoren1/wleiden.conf
===================================================================
--- /nodes/CNodeWatertoren1/wleiden.conf	(revision 9479)
+++ /nodes/CNodeWatertoren1/wleiden.conf	(revision 9480)
@@ -6,9 +6,21 @@
 $nodetype='CNode';
 $nodename='Watertoren1';
-$release="8.1-RELEASE";
+$release="8.2-RELEASE";
 $status='up';
 $X='111998';
 $Y='474286';
 $ileiden='yes';
+
+$config{'ath0'}=sprintf <<EW0;
+TYPE=wireless
+IP=$master_ip/26
+DESC=OMNI voor Wifi op de westeinder (MastX:PostX)
+SDESC=ap-omni
+DHCP=20-60
+MODE=master
+ESSID=ap-Westeinder-Watertoren1
+CHANNEL=8
+EW0
+
 
 $config{'vr0'}=sprintf <<EOT;
@@ -22,14 +34,48 @@
 EOT
 
-$config{'ath0'}=sprintf <<EW0;
-COMMENT=OMNI voor Wifi op de westeinder
-TYPE=wireless
-IP=$master_ip/26
-DESC=AP voor de buurt
-SDESC=ap-omni
-DHCP=20-60
-MODE=master
-ESSID=ap-Westeinder-Watertoren1
-CHANNEL=8
-EW0
 
+$config{'vr1'}=sprintf <<EOT;
+TYPE=ethernet
+STATUS=up
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.16.156/29
+DESC=Tijdelijke Link naar CNodeUnigorN (Mast2:Post3)
+SDESC=2unigorn
+DHCP=no
+MODE=bridge ap
+ESSID=il-no.unigorn.wleiden.net
+NSIP=172.16.16.155/29
+NSMAC=00:15:6D:F2:42:F3
+EOT
+
+
+$config{'vr2'}=sprintf <<EOT;
+TYPE=ethernet
+STATUS=up
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.16.33/29
+DESC=Nanostation naar CNodeDrijfhuis (Mast1:Pos3)
+SDESC=2drijfhuis
+DHCP=no
+MODE=bridge master
+ESSID=il-nw.watertoren1.wleiden.net
+CHANNEL=132
+NSIP=172.16.16.34/29
+NSMAC=00:15:6D:70:4D:A5
+EOT
+
+$config{'ue0'}=sprintf <<EOT;
+TYPE=ethernet
+STATUS=up
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.16.137/29
+DESC=Nanostation naar CNodeKempers1 (Mast2:Pos4)
+SDESC=2kempers1
+DHCP=no
+MODE=bridge master
+ESSID=il-nw.watertoren3.wleiden.net
+CHANNEL=132
+NSIP=172.16.16.138/29
+NSMAC=00:15:6D:70:4D:6C
+EOT
+
Index: /nodes/CNodeWatertoren2/wleiden.conf
===================================================================
--- /nodes/CNodeWatertoren2/wleiden.conf	(revision 9479)
+++ /nodes/CNodeWatertoren2/wleiden.conf	(revision 9480)
@@ -11,4 +11,16 @@
 $Y='474286';
 $ileiden='yes';
+
+$config{'ath0'}=sprintf <<EW0;
+TYPE=wireless
+IP=$master_ip/26
+DESC=OMNI voor Wifi op de westeinder (MastX:PosX)
+SDESC=ap-omni
+DHCP=20-60
+MODE=master
+ESSID=ap-Westeinder-Watertoren2
+CHANNEL=8
+EW0
+
 
 $config{'vr0'}=sprintf <<EOT;
@@ -25,40 +37,27 @@
 TYPE=ethernet
 STATUS=down
-IP=172.16.16.156/29
-DESC=Ethernet naar Leiden
-SDESC=2leiden
+IP=172.16.16.89/29
+DESC=Nanostation naar Schiphol (Mast1:Pos2) (UNUSED)
+SDESC=2schiphol
 MODE=station bridge
-ESSID=il-no.cetim1.wleiden.net
-CHANNEL=136
-NSMAC=00:15:6D:F2:42:F3
-NSIP=172.16.16.155/29
+ESSID=il-nw.watertoren2.wleiden.net
+CHANNEL=36
+NSMAC=00:15:6D:70:54:A4
+NSIP=172.16.16.90/29
 DHCP=no
 EOT
 
 $config{'vr2'}=sprintf <<EOT;
-COMMENT=nonostation naar drijfhuis
 TYPE=ethernet
-STATUS=up
-IP=172.16.16.33/29
-DESC=Ethernet naar drijfhuis
-SDESC=2drijfhuis
+STATUS=down
+IP=172.16.16.161/29
+DESC=Nanostation naar Aalsmeer (Mast1:Post3) (UNUSED)
+SDESC=2aalsmeer
 DHCP=no
 MODE=ap bridge
-ESSID=il-nw.watertoren1.wleiden.net
-CHANNEL=100
-NSMAC=00:15:6D:70:4D:A5
-NSIP=172.16.16.34
+ESSID=il-n.watertoren2.wleiden.net
+CHANNEL=36
+NSMAC=00:15:6d:70:4e:7f
+NSIP=172.16.16.162/29
 EOT
 
-$config{'ath0'}=sprintf <<EW0;
-COMMENT=OMNI voor Wifi op de westeinder
-TYPE=wireless
-IP=$master_ip/26
-DESC=AP voor de buurt
-SDESC=ap-omni
-DHCP=20-60
-MODE=master
-ESSID=ap-Westeinder-Watertoren2
-CHANNEL=8
-EW0
-
Index: /nodes/CNodeWatertoren3/wleiden.conf
===================================================================
--- /nodes/CNodeWatertoren3/wleiden.conf	(revision 9479)
+++ /nodes/CNodeWatertoren3/wleiden.conf	(revision 9480)
@@ -3,12 +3,24 @@
 #
 $location="Watertoren, Kudelstaartseweg,1431 GA, Aalsmeer";
-$master_ip='172.16.16.137';  
+$master_ip='172.17.14.1';
 $nodetype='CNode';
 $nodename='Watertoren3';
-$release="8.1-RELEASE";
+$release="8.2-RELEASE";
 $status='up';
 $X='111998';
 $Y='474286';
 $ileiden='yes';
+
+$config{'ath0'}=sprintf <<EW0;
+TYPE=wireless
+STATUS=down
+IP=$master_ip/26
+DESC=OMNI voor Wifi op de westeinder (Indoor)
+SDESC=ap-omni
+DHCP=20-60
+MODE=master
+ESSID=ap-Westeinder-Watertoren3
+CHANNEL=8
+EW0
 
 $config{'vr0'}=sprintf <<EOT;
@@ -23,5 +35,5 @@
 
 $config{'vr1'}=sprintf <<EOT;
-COMMENT=nanostation naar Kudelstaart/Bilderdam
+COMMENT=nanostation naar Kudelstaart/Bilderdam (Mast3:Pos3) (USUSED)
 TYPE=ethernet
 STATUS=up
@@ -40,12 +52,12 @@
 TYPE=ethernet
 STATUS=up
-IP=172.16.16.25/29
-DESC=Ethernet naar Van Lent
-SDESC=2vanlent
+IP=172.16.16.73/29
+DESC=Nanostation5 naar RecPark (Mast2:Post2)
+SDESC=2recpark
 MODE=ap bridge
 ESSID=il-zw.watertoren1.wleiden.net
 CHANNEL=124
 NSMAC=00:15:6D:70:52:52
-NSIP=172.16.16.26/29
+NSIP=172.16.16.74/29
 DHCP=no
 EOT
@@ -53,15 +65,14 @@
 
 $config{'ue0'}=sprintf <<EOT;
-COMMENT=nanostation naar Kempers
 TYPE=ethernet
 STATUS=up
 IP=172.16.16.100/29
-DESC=Ethernet naar Kempers
-SDESC=2kempers
+DESC=Tijdelijke Link naar Cetim1 (Mast3:Pos2)
+SDESC=2cetim1
 DHCP=no
 MODE=ap bridge
-ESSID=il-zw.watertoren3.wleiden.net
-CHANNEL=44
+ESSID=il-no.cetim1.wleiden.net
 NSMAC=00:15:6D:EC:81:F3
-NSIP=172.16.16.99/29
+NSIP=172.16.16.98/29
 EOT
+
Index: /nodes/proxy15/wleiden.conf
===================================================================
--- /nodes/proxy15/wleiden.conf	(revision 9479)
+++ /nodes/proxy15/wleiden.conf	(revision 9480)
@@ -1,3 +1,3 @@
-$master_ip='172.17.14.1';
+$master_ip='172.27.129.67';
 $gateway='192.168.178.1';
 $internalroute='172.27.129.65';
@@ -16,5 +16,5 @@
 COMMENT=Might need to be a /30 link
 TYPE=ethernet
-IP=172.27.129.67/28
+IP=$master_ip/28
 DESC=Link naar Zwet
 SDESC=downlink
Index: /nodes/retired/CNodeKempers/wleiden.conf
===================================================================
--- /nodes/retired/CNodeKempers/wleiden.conf	(revision 9480)
+++ /nodes/retired/CNodeKempers/wleiden.conf	(revision 9480)
@@ -0,0 +1,71 @@
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+$location="";
+$master_ip='172.25.90.1';  
+$nodetype='CNode';
+$nodename='AMKempers';
+$release="8.1-RELEASE";
+$status='down';
+$X='111998';
+$Y='474286';
+$ileiden='yes';
+
+$config{'vr0'}=sprintf <<EOT;
+COMMENT=nanostation naar watertoren2
+TYPE=ethernet
+STATUS=up
+IP=172.16.16.225/29
+DESC=Ethernet naar watertoren2
+SDESC=2recpark
+DHCP=no
+MODE=managed bridge
+ESSID=il-z.watertoren2.wleiden.net
+CHANNEL=
+NSMAC=
+NSIP=
+EOT
+
+$config{'vr1'}=sprintf <<EOT;
+COMMENT=nonostation naar Leimuiderkerk
+TYPE=ethernet
+STATUS=up
+IP=172.16.16.233/29
+DESC=Ethernet naar Leimuiderkerk
+SDESC=2leimuiderkerk
+DHCP=no
+MODE=managed bridge
+ESSID=il-zw.kempers.wleiden.net
+CHANNEL=
+NSMAC=
+NSIP=
+EOT
+
+$config{'vr2'}=sprintf <<EOT;
+COMMENT=nonostation naar bilderdam
+TYPE=ethernet
+STATUS=up
+IP=172.16.16.241/29
+DESC=Ethernet naar bilderdam
+SDESC=2bilderdam
+DHCP=no
+MODE=managed bridge
+ESSID=il-zo.kempers.wleiden.net
+CHANNEL=
+NSMAC=
+NSIP=
+EOT
+
+
+$config{'ath0'}=sprintf <<EW0;
+COMMENT=OMNI voor Wifi op de westeinder
+TYPE=wireless
+IP=$master_ip/26
+DESC=AP voor de buurt
+SDESC=ap-omni
+DHCP=70-120
+MODE=master
+ESSID=ap-Westereinder-Watertoren1
+CHANNEL=8
+EW0
+