Index: /nodes/CNodeDirkLos2/wleiden.conf
===================================================================
--- /nodes/CNodeDirkLos2/wleiden.conf	(revision 7406)
+++ /nodes/CNodeDirkLos2/wleiden.conf	(revision 7407)
@@ -1,17 +1,20 @@
+#
+#
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
 # config CNodeDirkLos2
 $location="Hogeschool Leiden, Zernikedreef 11, 2333 CK, Leiden";
-$master_ip='172.16.176.1';  
+$master_ip='172.19.132.1';  
 $gw_open='closed';
 $nodetype='CNode';
 $nodename='DirkLos2';
-$release="6.0-RELEASE";
+$release="IRIS";
 $node_config_version="1";
 $genesis_control="YES";
-
 $OS='FreeBSD';
 $labelpos='left';
-
 $status='up';
-
+# edugis x,y 92299,464748
 $X='092299';
 $Y='464748';
@@ -24,4 +27,5 @@
 POINT_TO_POINT=172.16.3.56
 SPEED=102400000
+DHCP=no
 SIS0
 
@@ -29,10 +33,11 @@
 TYPE=ethernet
 IP=172.16.176.65/27
-SDESC=eth_to_HSL
 DESC=Local Ethernet naar Hogeschool
+SDESC=eth_to_Hogeschool
+SPEED=102400000
 DHCP=70-94
 SIS00
 
-$config{'sis2'}=sprintf <<SIS2; # a-link naar Unigor via Nanostation5
+$config{'sis2'}=sprintf <<SIS2;
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -40,29 +45,23 @@
 DESC=Ethernet naar interlink west (unigor)
 SDESC=2Unigor
+SPEED=10240000000
+DHCP=no
 POINT_TO_POINT=172.16.3.73
-MODE=managed
-ESSID=il-o.unigor.wleiden.net
-CHANNEL=52
+MODE=master
+ESSID=il-w.dirklos2.wleiden.net
+CHANNEL=165
 SIS2
 
 $config{'sis2:0'}=sprintf <<SIS20;
 TYPE=ethernet
-IP=192.168.2.100/24
-SDESC=2Wandy
+IP=172.16.3.33/30
 DESC=Ethernet naar Wandy mgmt iface
+SDESC=2Wandy1
+SPEED=10240000000
 DHCP=no
-POINT_TO_POINT=192.168.2.10
+POINT_TO_POINT=172.16.3.34
 SIS20
 
-$config{'sis2:1'}=sprintf <<SIS21;
-TYPE=ethernet
-IP=172.16.3.33/30
-DESC=Ethernet naar Wandy mgmt iface
-SDESC=eth2wandy
-DHCP=no
-POINT_TO_POINT=172.16.3.34
-SIS21
-
-$config{'sis3'}=sprintf <<SIS3; # a-link naar AZC via Nanostation5
+$config{'sis3'}=sprintf <<SIS3;
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -70,19 +69,20 @@
 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=192.168.3.100/24
-DESC=Ethernet naar Wandy mgmt iface
-SDESC=2Wandy2
-SPEED=10240000000
-POINT_TO_POINT=192.168.3.10
-SIS30
-
-$config{'sis3:1'}=sprintf <<SIS31;
 TYPE=ethernet
 IP=172.16.3.41/30
@@ -90,8 +90,9 @@
 SDESC=2Wandy2
 SPEED=10240000000
+DHCP=no
 POINT_TO_POINT=172.16.3.42
-SIS31
+SIS30
 
-$config{'sis4'}=sprintf <<SIS4; # a-link naar Stadhuis2 via Nanostation5
+$config{'sis4'}=sprintf <<SIS4;
 TYPE=ethernet
 EXTRA_TYPE=eth2wifibridge
@@ -99,25 +100,28 @@
 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=192.168.4.100/24
-DESC=Ethernet naar Wandy mgmt iface
-SDESC=2Wandy3
-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
+SPEED=10240000000
+DHCP=no
 POINT_TO_POINT=172.16.3.50
-SIS41
+SIS40
 
 $config{'ath0'}=sprintf <<ATH0;  # Ap voor buurt
@@ -127,4 +131,5 @@
 SDESC=ap
 DHCP=10-60
+SPEED=11534336
 MODE=master
 ESSID=ap.DirkLos.wleiden.net