Index: nodes/CNodeZwet/wleiden.conf
===================================================================
--- nodes/CNodeZwet/wleiden.conf	(revision 6588)
+++ nodes/CNodeZwet/wleiden.conf	(revision 7186)
@@ -1,8 +1,6 @@
-#  Read by /usr/local/sbin/wireless-up.pl
 #
 # config CNodeZwet 
 $location="Fam van der Zwet, Nieuweweg 3, 2381 NW,Zoeterwoude ";
 $master_ip='172.27.129.1';
-$gw_open='closed';
 $nodetype='CNode';
 $nodename='Zwet';
@@ -10,77 +8,88 @@
 $status='up';
 
-$release="5.0-RELEASE";
-$node_config_version="1";
-$genesis_control="YES";
+$OS='FreeBSD';
 
-$OS='FreeBSD';
-$labelpos='left';
+# edugis x,y 94340,459330
+$X='94340';
+$Y='459330';
 
-# edugis x,y 94319,459273
-$X='94319';
-$Y='459273';
+# 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
+TYPE=ethernet
+IP=172.27.129.1/26
 
-$config{'ep0'}=sprintf <<ED0;
+DESC=Link to house
+SDESC=2zwet
+SPEED=10240000000
+
+DHCP=10-60
+
+ED1
+
+
+$config{'sis1'}=sprintf <<ED0;  # Ethernet
 TYPE=ethernet
-IP=172.27.129.81/28
-DESC=Link naar pc's
-SDESC=2zwet-pc
+IP=172.27.129.65/28
 
-DHCP=82-94
-
+DESC=Link to duivenhok - unused
+SDESC=2hok
+SPEED=10240000000
 
 ED0
 
-$config{'xl0'}=sprintf <<ED1;  # Link naar thuisnetwerk
-TYPE=ethernet
-IP=172.27.129.65/28
 
-DESC=Link naar thuisnetwerk 
-SDESC=2home
-SPEED=10240000000
+$config{'wi0'}=sprintf <<EW0;  # Link naar JVC
+TYPE=wireless
+IP=172.16.1.162/30
 
+DESC=Link naar JVC
+SDESC=2jvc
+SPEED=11534336
+
+POINT_TO_POINT=172.16.1.161
+
+MODE=managed
+ESSID=il-o.jvc.wleiden.net
 
 DHCP=no
 
-ED1
+POLAR=Hor
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=130
+BEAMWIDTH=40
+CABLE=2
+HEIGTH=2
 
-$config{'xl1'}=sprintf <<ED2;  # Link naar Duivenhok
-TYPE=ethernet
-IP=172.16.1.166/30
+EW0
 
-DESC=Link naar duivenhok
-SDESC=2duivenhok
-SPEED=10240000000
+$config{'wi1'}=sprintf <<EW1;
+TYPE=wireless
+IP=172.16.1.74/30
+
+DESC=Link naar SOM
+SDESC=2som
+SPEED=11534336
+
+POINT_TO_POINT=172.16.1.73
+
+MODE=managed
+ESSID=il-z.som.wleiden.net
 
 DHCP=no
 
-POINT_TO_POINT=172.16.1.165
+POLAR=Hor
+ANTENNA=SD19
+GAIN=19dBi
+DIRECTION=130
+BEAMWIDTH=40
+CABLE=4
+HEIGTH=2
 
-ED2
+EW1
 
-$config{'wi0'}=sprintf <<EW0;  # OMNI
-TYPE=wireless
-IP=$master_ip/26
-
-DESC=Omni voor de buurt
-SDESC=omni
-SPEED=11534336
-
-
-MODE=master
-ESSID=ap-omni.zwet.wleiden.net
-CHANNEL=1
-
-DHCP=10-60
-
-POLAR=Ver
-ANTENNA=omni
-GAIN=5dBi
-DIRECTION=omni
-BEAMWIDTH=360
-CABLE=5
-HEIGTH=14
-
-EW0
-
-