Index: nodes/CNodeCeTIM3/wleiden.conf
===================================================================
--- nodes/CNodeCeTIM3/wleiden.conf	(revision 4317)
+++ nodes/CNodeCeTIM3/wleiden.conf	(revision 4318)
@@ -95,13 +95,7 @@
 DHCP=no
 
-
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.0.74
-
 MODE=master
 ESSID=il-nw.cetim3.wleiden.net
 CHANNEL=1
-
 
 POLAR=Horiz
@@ -115,34 +109,28 @@
 EW
 
-$config{'wi0:0'}=sprintf <<EW00;  # link naar Rabo
-TYPE=wireless
-IP=172.16.0.97/30
-DESC=Link naar Rabo
-SDESC=2rabo
-SPEED=11534336
-POINT_TO_POINT=172.16.0.98
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.0.98
-
-DHCP=no
-EW00
-
-$config{'wi0:1'}=sprintf <<EW01;  # link naar Cope
-TYPE=wireless
-IP=172.16.0.25/30
-DESC=Link naar Cope
-SDESC=2cope
-SPEED=11534336
-POINT_TO_POINT=172.16.0.26
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.0.26
-
-DHCP=no
-
-EW01
-
-$config{'wi0:2'}=sprintf <<EW02;  # link naar OblC
+#$config{'wi0:3'}=sprintf <<EW03;  # link naar Rabo
+#TYPE=wireless
+#IP=172.16.0.97/30
+#DESC=Link naar Rabo
+#SDESC=2rabo
+#SPEED=11534336
+#POINT_TO_POINT=172.16.0.98
+#
+#DHCP=no
+#EW03
+
+#$config{'wi0:4'}=sprintf <<EW04;  # link naar Cope
+#TYPE=wireless
+#IP=172.16.0.25/30
+#DESC=Link naar Cope
+#SDESC=2cope
+#SPEED=11534336
+#POINT_TO_POINT=172.16.0.26
+#
+#DHCP=no
+#
+#EW04
+
+$config{'wi0:0'}=sprintf <<EW00;  # link naar OblC
 TYPE=wireless
 IP=172.16.0.161/30
@@ -156,7 +144,7 @@
 
 DHCP=no
-EW02
-
-$config{'wi0:3'}=sprintf <<EW03;
+EW00
+
+$config{'wi0:1'}=sprintf <<EW01;
 TYPE=wireless
 IP=172.16.0.181/30
@@ -167,7 +155,7 @@
 
 DHCP=no
-EW03
-
-$config{'wi0:4'}=sprintf <<EW04;  # link naar Burcht
+EW01
+
+$config{'wi0:2'}=sprintf <<EW02;  # link naar Burcht
 TYPE=wireless
 IP=172.16.0.105/30
@@ -181,5 +169,5 @@
 
 DHCP=no
-EW04
+EW02
 
 $config{'wi1'}=sprintf <<EW1;  #Interlinks ZO
Index: nodes/CNodeLvLn/wleiden.conf
===================================================================
--- nodes/CNodeLvLn/wleiden.conf	(revision 4317)
+++ nodes/CNodeLvLn/wleiden.conf	(revision 4318)
@@ -20,40 +20,13 @@
 TYPE=ethernet
 IP=172.17.144.65/29
-
-DESC=Ethernet naar School
+#                           172.17.144.66  lvln2
+#                           172.17.144.67  vpn-router
+DESC=lvln bacckbone ethernet
 SDESC=eth
 SPEED=10240000000
 
-#DHCP=68-70
 DHCP=no
 
-
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=no
-
 ED0
-
-
-$config{'ep0:0'}=sprintf <<SIS00;  # Ethernet
-TYPE=ethernet
-IP=172.16.2.45/30
-
-POINT_TO_POINT=172.16.2.46
-
-DESC=lvln Backbone
-SDESC=2lvln2
-SPEED=10240000000
-
-DHCP=no
-OSPF_COST=
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=
-
-SIS00
-
-
-
 
 
Index: nodes/CNodeLvLn2/wleiden.conf
===================================================================
--- nodes/CNodeLvLn2/wleiden.conf	(revision 4317)
+++ nodes/CNodeLvLn2/wleiden.conf	(revision 4318)
@@ -12,45 +12,22 @@
 $OS='FreeBSD';
 
-$status='up';
+$status='planned';
 
-$X='93386';
+$X='93446';
 $Y='464131';
 
 $config{'sis0'}=sprintf <<ED0;  # eth
 TYPE=ethernet
-IP=172.17.195.1/28
+IP=172.17.144.66/29
+#                     172.17.144.65  lvln
+#                     172.17.144.67  vpn-router
 
-DESC=Ethernet naar School
+DESC=lvln backbone ethernet
 SDESC=eth
 SPEED=10240000000
 
-#DHCP=68-70
 DHCP=no
 
-
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=no
-
 ED0
-
-$config{'sis0:0'}=sprintf <<SIS00;  # Ethernet
-TYPE=ethernet
-IP=172.16.2.46/30
-
-POINT_TO_POINT=172.16.2.45
-
-DESC=lvln Backbone
-SDESC=2lvln
-SPEED=10240000000
-
-DHCP=no
-OSPF_COST=2
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=
-
-SIS00
-
 
 
@@ -65,12 +42,8 @@
 DHCP=no
 
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=no
-
 POINT_TO_POINT=172.16.1.221
 
 MODE=managed
 ESSID=il-nw.stadhuis2.wleiden.net
-CHANNEL=1
 
 POLAR=Hor
@@ -86,33 +59,18 @@
 $config{'ath1'}=sprintf <<EW1;  # link naar rabo
 TYPE=wireless
-IP=172.16.2.53/30
+P=172.16.0.98/30
 DESC=Link naar rabo
 SDESC=2rabo
 SPEED=11534336
-POINT_TO_POINT=172.16.2.54
+POINT_TO_POINT=172.16.0.97
+DHCP=no
 
-
-
-OSPF_COST=11
-
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=
-
-MODE=master
-ESSID=il-n.lvln2.wleiden.net
-CHANNEL=5
+MODE=managed
+ESSID=il-zo.rabo.wleiden.net
 
 CARD_OPTION=mode 11b
 
-
 POLAR=Vert
 ANTENNA=SD15
-GAIN=13dBi
-DIRECTION=205
-BEAMWIDTH=35
-CABLE=1
-HEIGTH=10
-
-DHCP=no
 
 EW1
Index: nodes/CNodeRabo/wleiden.conf
===================================================================
--- nodes/CNodeRabo/wleiden.conf	(revision 4317)
+++ nodes/CNodeRabo/wleiden.conf	(revision 4318)
@@ -37,5 +37,5 @@
 ED0
 
-$config{'wi0'}=sprintf <<EW;  # AP omni
+$config{'wi0'}=sprintf <<EW0;  # AP omni
 TYPE=wireless
 IP=$master_ip/26
@@ -64,8 +64,8 @@
 HEIGTH=22
 
-EW
+EW0
 
 
-$config{'wi1'}=sprintf <<EW;  # link naar Rudi
+$config{'wi1'}=sprintf <<EW1;  # link naar Rudi
 TYPE=wireless
 IP=172.16.0.65/30
@@ -93,7 +93,7 @@
 DHCP=no
 
-EW
+EW1
 
-$config{'wi2'}=sprintf <<EW;  # Link naar AZC
+$config{'wi2'}=sprintf <<EW2;  # Link naar AZC
 TYPE=wireless
 IP=172.16.0.221/30  
@@ -121,7 +121,7 @@
 HEIGTH=22
 
-EW
+EW2
 
-$config{'wi2:0'}=sprintf <<EW0;  # link naar Lebkov
+$config{'wi2:0'}=sprintf <<EW20;  # link naar Lebkov
 TYPE=wireless
 IP=172.16.1.17/30
@@ -135,22 +135,57 @@
 
 DHCP=no
-EW0
+EW20
 
 
-$config{'wi3'}=sprintf <<EW;  # link naar CeTIM
+$config{'wi2:1'}=sprintf <<EW21;  # link naar Wissel 
 TYPE=wireless
-IP=172.16.0.98/30
-DESC=Link naar CeTIM
-SDESC=2cetim
+IP=172.16.2.45/30
+DESC=Link naar Wissel 
+SDESC=2wissel
 SPEED=11534336
-POINT_TO_POINT=172.16.0.97
+POINT_TO_POINT=172.16.2.46
 
-OSPF_BROADCAST=no
-OSPF_NEIGHBORS=172.16.0.97
+DHCP=no
+EW21
 
-MODE=managed
-ESSID=il-nw.cetim3.wleiden.net
 
-CHANNEL=1
+#$config{'wi3'}=sprintf <<EW;  # link naar CeTIM
+#TYPE=wireless
+#IP=172.16.0.98/30
+#DESC=Link naar CeTIM
+#SDESC=2cetim
+#SPEED=11534336
+#POINT_TO_POINT=172.16.0.97
+#DHCP=no
+#
+#OSPF_BROADCAST=no
+#OSPF_NEIGHBORS=172.16.0.97
+#
+#MODE=managed
+#ESSID=il-nw.cetim3.wleiden.net
+#
+#CHANNEL=1
+#
+#POLAR=Vert
+#ANTENNA=Patch
+#GAIN=15dBi
+#DIRECTION=165
+#BEAMWIDTH=40
+#CABLE=1
+#HEIGTH=22
+#
+#EW
+
+$config{'wi3'}=sprintf <<EW3;  # link naar Lucas van Leiden Noord
+TYPE=wireless
+IP=172.16.0.97/30
+DESC=Link naar Lvln
+SDESC=2lvln2
+SPEED=11534336
+POINT_TO_POINT=172.16.0.98
+DHCP=no
+
+MODE=master
+ESSID=il-zo.rabo.wleiden.net
 
 POLAR=Vert
@@ -161,7 +196,3 @@
 CABLE=1
 HEIGTH=22
-
-DHCP=no
-
-EW
-
+EW3