Index: nodes/CNodeRick/wleiden.conf
===================================================================
--- nodes/CNodeZwet/wleiden.conf	(revision 7654)
+++ nodes/CNodeRick/wleiden.conf	(revision 7993)
@@ -1,75 +1,49 @@
 #
 # config CNodeZwet 
-$location="Fam van der Zwet, Nieuweweg 3, 2381 NW,Zoeterwoude ";
-$master_ip='172.27.129.1';
+$location="Rick  van der Zwet, Brahmslaan 40, 2324 AN, Leiden";
+$master_ip='172.20.145.1';
 $nodetype='CNode';
-$nodename='Zwet';
-$remote_access='rvdzwet.xs4all.nl:23';
+$nodename='Rick';
 
 $status='up';
 
 
-# edugis x,y 94340,459330
-$X='94340';
-$Y='459330';
+# edugis x,y
+$X='92434';
+$Y='461987';
 
-# Wireless currently manually configured by the means of of a Bullet2 connected to sis1
-#TYPE=wireless
-#
-#MODE=master
-#ESSID=ap-omni.zwet.wleiden.net
-#CHANNEL=1
-$config{'sis0'}=sprintf <<ED1; # Public interface
+$config{'sis0'}=sprintf <<SIS0; # Link to proxy interface 
 TYPE=ethernet
+IP=172.16.3.97/30
+
+DESC=Proxy Link
+SDESC=2proxy
+SIS0
+
+
+$config{'wi0'}=sprintf <<WI0;  # Internal Wireless
+TYPE=wireless
+MODE=master
 IP=$master_ip/26
-
-DESC=Link to house
-SDESC=2zwet
 
 DHCP=10-60
 
-ED1
+DESC=Internal Wireless
+ESSID=Ap-WirelessLeiden-Rick-Binnen
+WI0
 
 
-$config{'sis1'}=sprintf <<ED0;  # Ethernet
+
+# Connected via NanoStation5
+# ESSID=il-zw.haagwijk.wleiden.net
+$config{'sis1'}=sprintf <<SIS1;  # Link naar Haagwijk
 TYPE=ethernet
-IP=172.27.129.65/28
+IP=172.16.3.86/30
 
-DESC=Link to duivenhok - unused
-SDESC=2hok
-
-ED0
-
-
-$config{'wi0'}=sprintf <<EW0;  # Link naar JVC
-TYPE=wireless
-IP=172.16.1.162/30
-
-DESC=Link naar JVC
-SDESC=2jvc
-
+DESC=Link naar Haagwijk
+SDESC=2haagwijk
 
 MODE=managed
-ESSID=il-o.jvc.wleiden.net
 
 DHCP=no
-
-
-EW0
-
-$config{'wi1'}=sprintf <<EW1;
-TYPE=wireless
-IP=172.16.1.74/30
-
-DESC=Link naar SOM
-SDESC=2som
-
-
-MODE=managed
-ESSID=il-z.som.wleiden.net
-
-DHCP=no
-
-
-EW1
-
+SIS1