Index: /nodes/proxy4/wleiden.conf
===================================================================
--- /nodes/proxy4/wleiden.conf	(revision 7512)
+++ /nodes/proxy4/wleiden.conf	(revision 7513)
@@ -3,70 +3,46 @@
 #  Read by /usr/local/sbin/wireless-up.pl
 #
-# config Proxy4 in Modelwoning Pergolesipad bij NodeLivingLab
+# config Proxy4 in woning Pergolesipad 95 bij NodeLivingLab
 # verbonden met Portaal glasvezel (172.16.0.0) via Linksys router subnet 192.168.1.0
 # nameservers: 217.149.192.6 en 217.149.196.6
 # WAN: 82.215.33.247, gateway 82.215.32.1
 
-$master_ip='172.20.140.4';  
+$master_ip='172.20.140.66'; 
+$gateway='192.168.1.1';
+$internalroute='172.20.140.65';
+$internalif='sis'; 
 $gw_open='closed';
 $nodetype='Proxy';
 $nodename='Proxy4';
+$proxyid='04';
 $labelpos='left';
-
-$location="Demowoning, Pergolesipad 95, 2324 DG, Leiden";
-
+$location="Pergolesipad 95, 2324 DG, Leiden";
 $status='up';
-
-$release="6.0-RELEASE";
+$release="8.0-RELEASE";
 $node_config_version="1";
 $genesis_control="YES";
-
 $OS='FreeBSD';
-
-# edugis x,y,92036,462256
 $X='92036';
 $Y='462256';
 
-$config{'sis0'}=sprintf <<SIS0;  # Ethernet
-TYPE=ethernet
-                                                                                
-DESC=Portaal glasvezel
-SDESC=2glas
+$config{'sis0'}=sprintf <<SIS0;  # Link naar Router
+TYPE=ethernet 
+IP=192.168.1.100/24                                                         
+DESC=Link naar Router
+SDESC=uplink
 SPEED=10240000000
-
-DHCP=yes
+DHCP=no
 #ip adres: 192.168.1.103
 #ip adres Linksys router: 192.168.1.1
 # user Linksys: <blanc>, standaard pwd
 # admin interface via https
-
-
 SIS0
 
-$config{'sis1'}=sprintf <<SIS1;  # Ethernet
+$config{'sis1'}=sprintf <<SIS1;  # Link naar NodeLivingLab
 TYPE=ethernet
-IP=172.20.140.66/27
-ROUTE=172.16.0.0/12 172.20.140.65/27
-
-DESC=Demowoning naar LivingLab
-SDESC=demo2LL
+IP=$master_ip/30
+DESC=Link naar NodeLivingLab
+SDESC=downlink
 SPEED=10240000000
-
 DHCP=no
-
 SIS1
-
-$config{'sis1:0'}=sprintf <<SIS10;  # Ethernet
-TYPE=ethernet
-IP=172.16.2.254/30
-ROUTE=172.16.0.0/12 172.16.2.253/30
-
-DESC=Link naar LivingLab
-SDESC=2LL
-SPEED=10240000000
-
-DHCP=no
-POINT_TO_POINT=172.16.2.253
-
-
-SIS10
Index: /nodes/proxy5/wleiden.conf
===================================================================
--- /nodes/proxy5/wleiden.conf	(revision 7512)
+++ /nodes/proxy5/wleiden.conf	(revision 7513)
@@ -7,45 +7,37 @@
 # nameservers: 217.149.192.6 en 217.149.196.6
 
-$master_ip='172.20.140.5';  
+$master_ip='172.19.168.66';
+$gateway='192.168.0.1';
+$internalroute='172.19.168.65';
+$internalif='sis';  
 $gw_open='closed';
 $nodetype='Proxy';
 $nodename='Proxy5';
+$proxyid='08';
 $labelpos='left';
 $location=" Openbare Basisschool Woutertje Pieterse, Houtlaan 60, 2334 CL, Leiden";
-
 $status='up';
-
-$release="6.0-RELEASE";
+$release="8.0-RELEASE";
 $node_config_version="1";
 $genesis_control="YES";
-
 $OS='FreeBSD';
-
-#edugis x,y  92927,465365
 $X='92927';
 $Y='465365';
 
-$config{'xl0'}=sprintf <<XL0;  # Ethernet
+$config{'sis0'}=sprintf <<SIS0;  # Link naar router
 TYPE=ethernet
-IP=192.168.0.16
-ROUTE=0.0.0.0 192.168.0.1/24                                                                               
-DESC=school glasvezel
-SDESC=2glasWP
+IP=192.168.0.16/24                                                                               
+DESC=Link naar router
+SDESC=uplink
 SPEED=10240000000
+DHCP=no
+SIS0
 
+$config{'sis1'}=sprintf <<SIS1;  # Link naar NodeWP
+TYPE=ethernet
+IP=$master_ip/30
+DESC=Link naar NodeWP
+SDESC=downlink
+SPEED=10240000000
 DHCP=no
-
-XL0
-
-$config{'xl1'}=sprintf <<XL1;  # Ethernet
-TYPE=ethernet
-IP=172.19.168.66/29
-ROUTE=172.16.0.0/12 172.20.140.65/27
-
-DESC=naar NodeWP
-SDESC=2nodeWP
-SPEED=10240000000
-
-DHCP=no
-
-XL1
+SIS1