Index: /nodes/HybridHofwijck/wleiden.yaml
===================================================================
--- /nodes/HybridHofwijck/wleiden.yaml	(revision 11259)
+++ /nodes/HybridHofwijck/wleiden.yaml	(revision 11259)
@@ -0,0 +1,92 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.18429"
+location  : "Zorgcentrum Hofwijck, Hazenboslaan 38, 2341 CC, Oegstgeest"
+longitude : "4.47762"
+masterip  : "172.23.16.1"
+nodename  : "Hofwijck"
+nodetype  : "Hybrid"
+rdnap_x   : 92795
+rdnap_y   : 466629
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap voor de buurt"
+  ip         : "172.23.16.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11b"
+  channel    : "8"
+  ssid       : "ap-WirelessLeiden-Hofwijck"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Ethernet naar Hofwijck"
+  ip         : "172.23.16.65/28"
+  sdesc      : "2hofwijck"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "B-Link naar Lange Voort"
+  ip         : "172.16.6.25/29"
+  sdesc      : "2langevoort"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "3"
+  ssid       : "il-w.hofwijck.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.6.26"
+  ns_mac     : "00:15:6d:e8:e7:37"
+  status     : "down"
+
+
+iface_vr1:
+  comment    : "Link naar UniGorN"
+  ip         : "172.16.17.236/29"
+  sdesc      : "2unigorn"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "104"
+  ssid       : "il-no.unigorn.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.17.235/29"
+  ns_mac     : "00:15:6d:f6:be:db"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Lijtweg1"
+  ip         : "172.16.3.108/29"
+  sdesc      : "2lijtweg1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "124"
+  ssid       : "il-o.lijtweg1.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.3.107"
+  ns_mac     : "00:15:6d:f7:be:d0"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: /nodes/HybridKaag1/wleiden.yaml
===================================================================
--- /nodes/HybridKaag1/wleiden.yaml	(revision 11259)
+++ /nodes/HybridKaag1/wleiden.yaml	(revision 11259)
@@ -0,0 +1,84 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.21262"
+location  : "Jachtwerf Hoogeboom, Julianalaan 72, 2159 LD, Kaag (Eiland)"
+longitude : "4.55594"
+masterip  : "172.27.0.1"
+nodename  : "Kaag1"
+nodetype  : "Hybrid"
+rdnap_x   : 98187
+rdnap_y   : 469717
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Omni voor de buurt"
+  ip         : "172.27.0.1/24"
+  sdesc      : "omni"
+  mode       : "ap"
+  type       : "11b"
+  channel    : "9"
+  ssid       : "ap-WirelessLeiden-SPKaag1"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar Lijtweg1"
+  ip         : "172.16.3.4/29"
+  sdesc      : "2lijtweg1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "124"
+  ssid       : "il-o.lijtweg1.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.3.3/29"
+  ns_mac     : "00:15:6d:70:54:63"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Kaag2"
+  ip         : "172.16.17.68/29"
+  sdesc      : "2kaag2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-z.kaag2.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.17.67/29"
+  ns_mac     : "00:15:6d:70:51:f6"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar KWVdeKaag"
+  ip         : "172.16.18.1/29"
+  sdesc      : "2kwvdekaag"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-z.kaag1.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.18.2/29"
+  ns_mac     : "00:15:6d:70:52:67"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: /nodes/HybridKaag2/wleiden.yaml
===================================================================
--- /nodes/HybridKaag2/wleiden.yaml	(revision 11259)
+++ /nodes/HybridKaag2/wleiden.yaml	(revision 11259)
@@ -0,0 +1,97 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.21786"
+location  : "Jachtwerf Feadship (Van Lent), Julianalaan 3, 2159 LA, Kaag (Eiland)"
+longitude : "4.55925"
+masterip  : "172.27.8.1"
+nodename  : "Kaag2"
+nodetype  : "Hybrid"
+rdnap_x   : 98420
+rdnap_y   : 470298
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Omni voor de buurt"
+  ip         : "172.27.8.1/24"
+  sdesc      : "omni"
+  mode       : "ap"
+  type       : "11b"
+  channel    : "3"
+  ssid       : "ap-WirelessLeiden-Spkaag2"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar Watertoren3"
+  ip         : "172.16.16.25/29"
+  sdesc      : "2watertoren3"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-no.kaag2.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.16.26/29"
+  ns_mac     : "00:15:6d:70:52:5d"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Kaag1"
+  ip         : "172.16.17.65/29"
+  sdesc      : "2kaag1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-z.kaag2.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.17.66/29"
+  ns_mac     : "00:15:6d:70:51:ea"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1_alias0:
+  comment    : "Link naar Boterhuis"
+  ip         : "172.16.6.89/29"
+  sdesc      : "2boterhuis"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-z.kaag2.wleiden.net"
+  dhcp       : False
+  compass    : "s"
+  status     : "down"
+
+
+iface_vr2:
+  comment    : "Link naar UnigorN"
+  ip         : "172.16.17.76/29"
+  sdesc      : "2unigorn"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "60"
+  ssid       : "il-no.unigorn.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.17.75/29"
+  ns_mac     : "00:15:6d:70:54:98"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: /nodes/HybridLijtweg1/wleiden.yaml
===================================================================
--- /nodes/HybridLijtweg1/wleiden.yaml	(revision 11259)
+++ /nodes/HybridLijtweg1/wleiden.yaml	(revision 11259)
@@ -0,0 +1,121 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.18523"
+location  : "Lijtweg (noord),  2341 HB, Oegstgeest"
+longitude : "4.47100"
+masterip  : "172.23.12.1"
+nodename  : "Lijtweg1"
+nodetype  : "CNode"
+rdnap_x   : 92344
+rdnap_y   : 466740
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap noord"
+  ip         : "172.23.12.1/24"
+  sdesc      : "ap-n"
+  mode       : "ap"
+  type       : "11b"
+  channel    : "4"
+  ssid       : "ap-WirelessLeiden-Lijtweg1"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar Lange Voort"
+  ip         : "172.16.6.1/29"
+  sdesc      : "2langevoort"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "2"
+  ssid       : "il-o.lijtweg1.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.6.2"
+  ns_mac     : "00:15:6d:e9:e7:20"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+
+iface_ue1:
+  comment    : "Ethernet naar Lijtweg2"
+  ip         : "172.16.253.1/30"
+  sdesc      : "2lijtweg2"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "InterLink naar Rene"
+  ip         : "172.16.6.9/29"
+  sdesc      : "2rene"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-n.lijtweg1.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.6.10"
+  ns_mac     : "00:15:6d:71:53:4e"
+  bridge_type: "NanoStation5"
+  status     : "down"
+
+
+iface_vr1:
+  comment    : "Link naar Hofwijck"
+  ip         : "172.16.3.105/29"
+  sdesc      : "2hofwijck"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "124"
+  ssid       : "il-o.lijtweg1.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.3.106"
+  ns_mac     : "00:15:6d:71:53:86"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1_alias0:
+  comment    : "Link naar Kaag1"
+  ip         : "172.16.3.1/29"
+  sdesc      : "2kaag1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Aster"
+  ip         : "172.16.17.89/29"
+  sdesc      : "2aster"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-w.lijtweg1.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.17.90/29"
+  ns_mac     : "00:15:6d:70:54:65"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: /nodes/HybridLijtweg2/wleiden.conf.old
===================================================================
--- /nodes/HybridLijtweg2/wleiden.conf.old	(revision 11259)
+++ /nodes/HybridLijtweg2/wleiden.conf.old	(revision 11259)
@@ -0,0 +1,166 @@
+#
+#  Read by /usr/local/sbin/wireless-up.pl
+#
+# config CNodeLijtweg3
+$location="Lijtweg, Oegstgeest";
+$master_ip='172.23.13.1';  
+
+$gw_open='closed';
+$nodetype='CNode';
+$nodename='Lijtweg3';
+$labelpos='left';
+
+$release="5.0-RELEASE";
+$node_config_version="1";
+$genesis_control="YES";
+
+$OS='FreeBSD';
+
+$status='up';
+
+# edugis x,y 92342,466702
+$X='92342';
+$Y='466702';
+
+
+$config{'ep0'}=sprintf <<ED0;  # Ethernet nr nodes
+TYPE=ethernet
+IP=172.16.253.3/29
+
+
+DESC=Ethernet naar lijtweg nodes
+SDESC=eth
+SPEED=10240000000
+POINT_TO_POINT=172.16.253.1 172.16.253.2
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.253.1 172.16.253.2
+
+ED0
+
+
+$config{'wi0'}=sprintf <<EW0;  # Link naar Brug 
+TYPE=wireless
+IP=172.16.1.177/30
+DESC=Link naar school de Brug
+SDESC=2brug
+SPEED=11534336
+POINT_TO_POINT=172.16.1.178
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.1.178
+
+DHCP=no
+
+MODE=master
+ESSID=il-z.lijtweg3.wleiden.net
+
+CHANNEL=6
+
+POLAR=HOR
+ANTENNA=SD15
+
+EW0
+
+
+$config{'wi0:0'}=sprintf <<EW00;  # Link naar Camimplants 
+TYPE=wireless
+IP=172.16.0.125/30
+DESC=Link naar Camimplants
+SDESC=2camimplants
+SPEED=11534336
+POINT_TO_POINT=172.16.0.126
+
+DHCP=no
+
+EW00
+
+
+$config{'wi1'}=sprintf <<EW1;  # link naar Rustenborch
+TYPE=wireless
+IP=172.16.1.85/30
+DESC=Link naar Rustenborch
+SDESC=2rustenborch
+SPEED=11534336
+POINT_TO_POINT=172.16.1.86
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.1.86
+
+DHCP=no
+
+MODE=master
+ESSID=il-zw.lijtweg3.wleiden.net
+
+CHANNEL=11
+
+POLAR=Hor
+ANTENNA=SD15
+GAIN=13dBi
+DIRECTION=225
+BEAMWIDTH=40
+CABLE=1
+HEIGTH=35
+
+
+EW1
+
+$config{'wi2'}=sprintf <<EW2;  # link naar Hofwijck
+TYPE=wireless
+MODE=master
+DHCP=no
+ESSID=il-zo.lijtweg3.wleiden.net
+CHANNEL=5
+SPEED=11534336
+IP=172.16.1.81/30
+DESC=Link naar Hofwijck
+SDESC=2hofwijck
+SPEED=11534336
+POINT_TO_POINT=172.16.1.82
+
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.1.82
+
+DHCP=no
+POLAR=Hor
+ANTENNA=SD15
+CABLE=2
+
+EW2
+
+$config{'wi2:0'}=sprintf <<EW20;
+TYPE=wireless
+IP=172.16.0.185/30
+DESC=Link naar Rudi
+SDESC=2rudi
+SPEED=11534336
+POINT_TO_POINT=172.16.0.186
+
+DHCP=no
+
+EW20
+
+$config{'wi3'}=sprintf <<EW3;  # Link naar AZC
+TYPE=wireless
+DESC=Interlink naar AZC
+SDESC=2azc
+
+IP=172.16.1.98/30
+MODE=managed
+
+ESSID=il-n.azc.wleiden.net
+CHANNEL=9
+SPEED=11534336
+
+POINT_TO_POINT=172.16.1.97
+OSPF_BROADCAST=no
+OSPF_NEIGHBORS=172.16.1.97
+DHCP=no
+
+POLAR=Hor
+ANTENNA=SD15
+CABLE=2
+EW3
+
+
+
Index: /nodes/HybridLijtweg2/wleiden.yaml
===================================================================
--- /nodes/HybridLijtweg2/wleiden.yaml	(revision 11259)
+++ /nodes/HybridLijtweg2/wleiden.yaml	(revision 11259)
@@ -0,0 +1,130 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.18489"
+location  : "Lijtweg,  2341 HB, Oegstgeest"
+longitude : "4.47098"
+masterip  : "172.23.13.1"
+nodename  : "Lijtweg2"
+nodetype  : "Hybrid"
+rdnap_x   : 92342
+rdnap_y   : 466702
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap zuid"
+  ip         : "172.23.13.1/24"
+  sdesc      : "ap-z"
+  mode       : "ap"
+  type       : "11b"
+  channel    : "10"
+  ssid       : "ap-WirelessLeiden-Lijtweg2"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Ethernet naar Lijtweg1"
+  ip         : "172.16.253.2/30"
+  sdesc      : "2lijtweg1"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_ue1:
+  comment    : "Interlink naar KWVdeKaag"
+  ip         : "172.16.17.249/29"
+  sdesc      : "2unigorn"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-ono.lijtweg2.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.17.250/29"
+  ns_mac     : "00:15:6d:f2:43:eb"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_ue1_alias0:
+  comment    : "Link naar Boterhuis"
+  ip         : "172.16.6.81/29"
+  sdesc      : "2boterhuis"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  status     : "down"
+
+
+iface_vr0:
+  comment    : "InterLink naar Rustenborch"
+  ip         : "172.16.6.33/29"
+  sdesc      : "2rustenborch"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-w.lijtweg2.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.6.34"
+  ns_mac     : "00:15:6d:70:51:c6"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar de Leidse Houtschool"
+  ip         : "172.16.3.113/29"
+  sdesc      : "2lhs"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-z.lijtweg2.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.3.114/29"
+  ns_mac     : "00:15:6d:71:54:c7"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1_alias0:
+  comment    : "Link naar Camimplants"
+  ip         : "172.16.6.97/29"
+  sdesc      : "2camimplants"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "InterLink naar Broekplein"
+  ip         : "172.16.5.140/29"
+  sdesc      : "2broekplein"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-w.broekplein.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.5.139/29"
+  ns_mac     : "00:15:6d:70:4d:d3"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+