Index: nodes/proxy3/wleiden.conf
===================================================================
--- nodes/proxy3/wleiden.conf	(revision 7657)
+++ nodes/proxy3/wleiden.conf	(revision 7975)
@@ -1,60 +1,33 @@
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config Proxy3 bij RV
 
 $master_ip='172.20.128.98';  
+$gateway='83.160.182.1';
+$internalroute='172.20.128.97';
+$internalif='sis';
 $nodetype='Proxy';
 $nodename='Proxy3';
-
+$proxyid='03';
 $location="Zorgcentrum Rijn en Vliet, Aaltje Noordewierlaan1, 2324 KP, Leiden";
-
 $status='up';
-
-$release="5.0-RELEASE";
-
-
-# edugis x,y 92445,462819
+$release="8.0-RELEASE";
 $X='92445';
 $Y='462819';
 
-$config{'xl0'}=sprintf <<XL0;  # Ethernet
+$config{'sis0'}=sprintf <<SIS0;  # Ethernet
 TYPE=ethernet
-IP=83.160.182.75/24
-ROUTE=0.0.0.0/0 83.160.182.1
-                                                                                
-DESC=XS4ALL (ex-Demon) DSL lijn
-SDESC=2dsl
+IP=83.160.182.75/24                                                                        
+DESC=Link naar XS4ALL DSL lijn
+SDESC=uplink
+DHCP=no
+SIS0
 
-DHCP=yes
+$config{'sis1'}=sprintf <<SIS1;  # Ethernet
+TYPE=ethernet
+IP=$master_ip/29
+DESC=Link naar NodeRijnVliet
+SDESC=downlink
+DHCP=no
+SIS1
 
 
-XL0
-
-$config{'xl1'}=sprintf <<XL1;  # Ethernet
-TYPE=ethernet
-IP=$master_ip/29
-ROUTE=172.16.0.0/12 172.20.128.97
-
-DESC=Link naar RV
-SDESC=2rv
-
-DHCP=no
-
-
-XL1
-
-$config{'xl1:0'}=sprintf <<XL10;  # Ethernet
-TYPE=ethernet
-IP=172.31.255.1/28
-
-DESC=Link naar RV
-SDESC=link2rv
-
-DHCP=no
-
-
-XL10
-
-