Index: nodes/CNodeRichard/wleiden.conf
===================================================================
--- nodes/CNodeRichard/wleiden.conf	(revision 8289)
+++ nodes/CNodeRichard/wleiden.conf	(revision 8290)
@@ -6,5 +6,5 @@
 # config CNodeHuub
 $location='Richard, Terschelling 244, 3524az, Utrecht'; 
-$master_ip='172.16.3.33';  
+$master_ip='172.17.6.1';  
 $nodetype='CNode';
 $nodename='Richard';
@@ -17,5 +17,6 @@
 COMMENT=Local ethernet to proxy
 TYPE=ethernet
-IP=$master_ip/30
+EXTRA_TYPE=tunnel
+IP=172.16.16.10/30
 DESC=Local Ethernet to proxy
 SDESC=2proxy
@@ -24,7 +25,7 @@
 
 $config{'wi0'}=sprintf <<WI0;
-COMMENT=Local ethernet to proxy
+COMMENT=Wireless AccessPoint Thuis
 TYPE=wireless
-IP=172.17.0.17/26
+IP=$master_ip/26
 DESC=AP
 SDESC=ap
Index: nodes/proxy8/wleiden.conf
===================================================================
--- nodes/proxy8/wleiden.conf	(revision 8289)
+++ nodes/proxy8/wleiden.conf	(revision 8290)
@@ -18,7 +18,6 @@
 $release="8.0-RELEASE";
 
-#edugis x,y 93348,463569
-$X='093348';
-$Y='463569';
+$X='137949';
+$Y='453165';
 
 
@@ -36,7 +35,7 @@
 
 $config{'sis1'}=sprintf <<SIS1;
-COMMENT=Link naar Laptop
+COMMENT=Link naar NodeRichard
 TYPE=ethernet
-IP=$master_ip/30
+IP=172.16.16.9/30
 
 DESC=Link