Index: nodes/CNodeWP/wleiden.conf
===================================================================
--- nodes/CNodeWP/wleiden.conf	(revision 8493)
+++ nodes/CNodeWP/wleiden.conf	(revision 8993)
@@ -1,5 +1,2 @@
-#
-#  Read by /usr/local/sbin/wireless-up.pl
-#
 # config CNodeWP
 $location=" Openbare Basisschool Woutertje Pieterse, Houtlaan 60, 2334 CL, Leiden";
@@ -7,13 +4,8 @@
 $nodetype='CNode';
 $nodename='WP';
-$release="8.0-RELEASE";
-
-$DISK='FLASH';
-
-#edugis x,y  92927,465365
+$release="8.2-RELEASE";
+$status='up';
 $X='92927';
 $Y='465365';
-
-$status='up';
 
 $config{'sis0'}=sprintf <<SIS0;
@@ -21,15 +13,25 @@
 TYPE=ethernet
 STATUS=up
-IP=172.19.168.65/29
-
-
-DESC=Ethernet naar de school
-SDESC=eth
-
+IP=172.19.168.65/30
+DESC=Ethernet naar proxy5
+SDESC=2proxy5
 DHCP=no
-
-
 SIS0
 
+$config{'sis1'}=sprintf <<SIS1;
+COMMENT=a-link zuid - psycho
+TYPE=ethernet
+STATUS=down
+EXTRA_TYPE=eth2wifibridge
+IP=172.16.16.124/29
+DESC=Ethernet to interlink zuid
+SDESC=2psycho
+DHCP=no
+MODE=station-wds
+ESSID=il-n.psycho.wleiden.net
+CHANNEL=116
+NSMAC=00:15:6D:
+NSIP=172.16.16.123/29
+SIS1
 
 $config{'wi0'}=sprintf <<EW0;
@@ -37,34 +39,21 @@
 TYPE=wireless
 IP=$master_ip/26
-
 DESC=Omni voor de buurt
-SDESC=omni
-
+SDESC=ap
 DHCP=10-60
-
 MODE=master
-ESSID=ap-omni.wp.wleiden.net
+ESSID=ap-WirelessLeiden-WP
 CHANNEL=5
-
-
-
 EW0
-
 
 $config{'wi1'}=sprintf <<EW1;
 COMMENT=Link naar AZC
 TYPE=wireless
-#11=Wandy WP depedance
-#12=Computer dependance
 IP=172.16.2.10/29
 DESC=Link naar AZC
 SDESC=2azc
-
-
 MODE=managed
 ESSID=il-no.azc.wleiden.net
 CHANNEL=11
-
-
 DHCP=no
 EW1