Index: /nodes/CNodeVosko2/wleiden.conf
===================================================================
--- /nodes/CNodeVosko2/wleiden.conf	(revision 3534)
+++ /nodes/CNodeVosko2/wleiden.conf	(revision 3541)
@@ -4,16 +4,16 @@
 #
 # config CNodeVosko2
+
 $location='Pieterskerk torentje, Kloksteeg 16, 2311 SL, Leiden';
 
-
-$master_ip='172.xx.0.1';  
+$master_ip='172.17.175.1';  
 $gw_open='closed';
 $nodetype='CNode';
 $nodename='Vosko2';
-
 $OS='FreeBSD';
 $DISK='FLASH';
 
 $status='planned';
+$labelpos='left';
 
 $X='093360';
@@ -23,9 +23,24 @@
 
 
-$config{'sis0'}=sprintf <<SIS0;  # Ethernet
+$config{'sis10'}=sprintf <<SIS10;  # Ethernet
 TYPE=ethernet
-IP=172.xx.0.65/28
+IP=172.17.176.7/28
 
 DESC=Ethernet naar Pieterskerk
+SDESC=eth
+SPEED=10240000000
+
+DHCP=10-60
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=no
+
+SIS10
+
+$config{'sis11'}=sprintf <<SIS11;  # Ethernet
+TYPE=ethernet
+IP=172.17.176.2/28
+
+DESC=Ethernet naar Vosko1
 SDESC=eth
 SPEED=10240000000
@@ -36,114 +51,90 @@
 OSPF_NEIGHBORS=no
 
-SIS0
+SIS11
 
+$config{'wi0'}=sprintf <<EW0;  # interlink N
+TYPE=wireless
+IP=172.16.0.149/30
 
-
-$config{'wi0'}=sprintf <<EW0;  
-TYPE=wireless
-IP=$master_ip/26
-
-DESC=PA6060
+DESC=vosko2 richting N
 SDESC=no
 SPEED=11534336
-
-DHCP=10-60
-#DHCP_STATIC= host ipaq1{hardware ethernet 00:02:2D:0E:4F:0D; fixed-address 172.18.8.2;} host ipaq2{hardware ethernet 00:02:2D:09:21:28; fixed-address 172.18.8.3;}
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=no
-
-MODE=master
-ESSID=.vosko2.wleiden.net
-CHANNEL=
-
-POLAR=Hor
-ANTENNA= 6060
-GAIN=10 dBi
-DIRECTION=
-BEAMWIDTH=60
-CABLE=0
-HEIGTH=40
-
-EW0
-
-$config{'wi1'}=sprintf <<EW1;  # link naar 
-TYPE=wireless
-IP=172..1.62/30
-DESC=Link naar  
-SDESC=2.....
-SPEED=11534336
-POINT_TO_POINT=172..1.61
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172..1.61
-
-MODE=master
-ESSID=.vosko.wleiden.net
-
-CHANNEL=9
-
-POLAR=Hor
-ANTENNA=PA6060
-GAIN=10dBi
-DIRECTION=
-BEAMWIDTH=60
-CABLE=1
+POINT_TO_POINT=172.16.0.150
 
 DHCP=no
 
-EW1
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.150
 
-$config{'wi2'}=sprintf <<EW2;  # link naar 
-TYPE=wireless
-IP=172..1.66/30
-DESC=Link naar
-SDESC=2....
-SPEED=1153436
-POINT_TO_POINT=172..1.65
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172..1.65
-
-MODE=managed
-ESSID=.vosko2.wleiden.net
-
-CHANNEL=1
-
-POLAR=Hor
-ANTENNA=PA6060
-GAIN=10dBi
-DIRECTION=
-BEAMWIDTH=60
-CABLE=2
-
-DHCP=no
-
-EW2
-
-$config{'wi3'}=sprintf <<EW3;   # Link naar 
-TYPE=wireless
-IP=172..1.70/30
-DESC=Link naar 
-SDESC=2.....
-SPEED=11534336
-POINT_TO_POINT=172..1.69
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172..1.69
-
-MODE=managed
-ESSID=.vosko2.wleiden.net
-
+MODE=master
+ESSID=il-n.vosko2.wleiden.net
 CHANNEL=5
 
 POLAR=Hor
 ANTENNA=PA6060
-GAIN=10dBi
-DIRECTION=
+GAIN=8 dBi
+DIRECTION=0
 BEAMWIDTH=60
-CABLE=1
+CABLE=6
+HEIGTH=45
+
+EW0
+
+$config{'wi1'}=sprintf <<EW1;  # interlink zuid 
+TYPE=wireless
+IP=172.16.0.125/30
+DESC=Link naar zuid  
+SDESC=2...
+SPEED=11534336
+POINT_TO_POINT=172.16.0.126
 
 DHCP=no
 
-EW3
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.126
+
+MODE=master
+ESSID=il-z.vosko1.wleiden.net
+
+CHANNEL=8
+
+POLAR=Hor
+ANTENNA=PA6060
+GAIN=8 dBi
+DIRECTION=45
+BEAMWIDTH=60
+CABLE=6
+HEIGTH=45
+
+
+EW1
+
+$config{'wi2'}=sprintf <<EW2;  # interlink NW
+TYPE=wireless
+IP=172.16.0.129/30
+DESC=Link naar
+SDESC=2....
+SPEED=1153436
+POINT_TO_POINT=172.16.0.130
+
+DHCP=no
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.0.130
+
+MODE=master
+ESSID=il-nw.vosko.wleiden.net
+
+CHANNEL=11
+
+POLAR=Hor
+ANTENNA=PA6060
+GAIN=8 dBi
+DIRECTION=45
+BEAMWIDTH=60
+CABLE=6
+HEIGTH=45
+
+
+EW2
+