Index: /nodes/CNodeDirkLos2/wleiden.conf
===================================================================
--- /nodes/CNodeDirkLos2/wleiden.conf	(revision 6901)
+++ /nodes/CNodeDirkLos2/wleiden.conf	(revision 6902)
@@ -1,38 +1,12 @@
-#
-#
-#
-#  Read by /usr/local/sbin/wireless-up.pl
-#
 # config CNodeDirkLos2
 $location="Hogeschool Leiden, Zernikedreef 11, 2333 CK, Leiden";
-
 $master_ip='172.16.176.1';  
-$gw_open='closed';
-$nodetype='CNode';
-$nodename='DirkLos2';
-$release="IRIS";
-$node_config_version="1";
-$genesis_control="YES";
-
-$OS='FreeBSD';
-$labelpos='left';
-
-$status='up';
-
-# edugis x,y 92299,464748
-$X='092299';
-$Y='464748';
-
 $config{'sis0'}=sprintf <<SIS0;  # ethernet naar NodeDirkLos1 met PoE
 TYPE=ethernet
 IP=172.16.3.57/30
-
 DESC=Local Ethernet naar DirkLos1
 SDESC=eth_to_DirkLos1
 POINT_TO_POINT=172.16.3.56
 SPEED=102400000
-
-DHCP=no
-
 SIS0
 
@@ -40,132 +14,92 @@
 TYPE=ethernet
 IP=172.16.176.65/27
-
 DESC=Local Ethernet naar Hogeschool
-SDESC=eth_to_Hogeschool
-SPEED=102400000
-
 DHCP=70-94
-
 SIS00
 
-
-$config{'sis2'}=sprintf <<SIS2;
+$config{'sis2'}=sprintf <<SIS2; # a-link naar Unigor via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
 IP=172.16.3.65/30
-
 DESC=Ethernet naar interlink west (unigor)
 SDESC=2Unigor
-SPEED=10240000000
-
-DHCP=no
-
 POINT_TO_POINT=172.16.3.66
-
-MODE=master
-ESSID=il-w.dirklos2.wleiden.net
-CHANNEL=165
-
+MODE=managed
+ESSID=il-o.unigor.wleiden.net
+CHANNEL=52
 SIS2
 
 $config{'sis2:0'}=sprintf <<SIS20;
 TYPE=ethernet
-IP=172.16.3.33/30
-
+IP=192.168.2.100/24
 DESC=Ethernet naar Wandy mgmt iface
-SDESC=2Wandy1
-SPEED=10240000000
-
 DHCP=no
-
-POINT_TO_POINT=172.16.3.34
-
+POINT_TO_POINT=192.168.2.10
 SIS20
 
+$config{'sis2:1'}=sprintf <<SIS21;
+TYPE=ethernet
+IP=172.16.3.33/30
+DESC=Ethernet naar Wandy mgmt iface
+DHCP=no
+POINT_TO_POINT=172.16.3.34
+SIS21
 
-$config{'sis3'}=sprintf <<SIS3;
+$config{'sis3'}=sprintf <<SIS3; # a-link naar AZC via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
 IP=172.16.3.37/30
-
 DESC=Ethernet naar interlink noord-oost (AZC)
 SDESC=2AZC
-SPEED=10240000000
-
-DHCP=no
-
 POINT_TO_POINT=172.16.3.38
-
 MODE=master
 ESSID=il-no.dirklos2.wleiden.net
-CHANNEL=
-
-POLAR=
-ANTENNA=
-GAIN=
-DIRECTION=
-BEAMWIDTH=
-CABLE=
-HEIGTH=
-
 SIS3
 
 $config{'sis3:0'}=sprintf <<SIS30;
 TYPE=ethernet
-IP=172.16.3.41/30
-
+IP=192.168.3.100/24
 DESC=Ethernet naar Wandy mgmt iface
 SDESC=2Wandy2
 SPEED=10240000000
-
-DHCP=no
-
-POINT_TO_POINT=172.16.3.42
-
+POINT_TO_POINT=192.168.3.10
 SIS30
 
-$config{'sis4'}=sprintf <<SIS4;
+$config{'sis3:1'}=sprintf <<SIS31;
+TYPE=ethernet
+IP=172.16.3.41/30
+DESC=Ethernet naar Wandy mgmt iface
+SDESC=2Wandy2
+SPEED=10240000000
+POINT_TO_POINT=172.16.3.42
+SIS31
+
+$config{'sis4'}=sprintf <<SIS4; # a-link naar Stadhuis2 via Nanostation5
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
 IP=172.16.3.46/30
-
 DESC=Ethernet naar interlink zuid-oost (stadhuis2)
 SDESC=2Stadhuis
-SPEED=10240000000
-
-DHCP=no
-
 POINT_TO_POINT=172.16.3.45
-
 MODE=managed
 ESSID=il-nw.stadhuis2.wleiden.net
 CHANNEL=36
-
-
-
-POLAR=
-ANTENNA=
-GAIN=
-DIRECTION=
-BEAMWIDTH=
-CABLE=
-HEIGTH=
-
 SIS4
 
 $config{'sis4:0'}=sprintf <<SIS40;
 TYPE=ethernet
-IP=172.16.3.49/30
-
+IP=192.168.4.100/24
 DESC=Ethernet naar Wandy mgmt iface
 SDESC=2Wandy3
-SPEED=10240000000
-
-DHCP=no
-
-POINT_TO_POINT=172.16.3.50
-
+POINT_TO_POINT=192.168.4.10
 SIS40
 
+$config{'sis4:1'}=sprintf <<SIS41;
+TYPE=ethernet
+IP=172.16.3.49/30
+DESC=Ethernet naar Wandy mgmt iface
+SDESC=2Wandy3
+POINT_TO_POINT=172.16.3.50
+SIS41
 
 $config{'ath0'}=sprintf <<ATH0;  # Ap voor buurt
@@ -175,15 +109,9 @@
 SDESC=ap
 DHCP=10-60
-
-SPEED=11534336
-
-
 MODE=master
 ESSID=ap.DirkLos.wleiden.net
 CHANNEL=2
 CARD_OPTION=mode 11b
-
 POLAR=Vert
-
 ATH0