Index: nodes/AJSoft1/wleiden.yaml
===================================================================
--- nodes/AJSoft1/wleiden.yaml	(revision 13401)
+++ nodes/AJSoft1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,105 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+ileiden   : True
+latitude  : "52.14605"
+location  : "Serviceflat De Parelvissers, Bizetpad 4, 2324 JR, Leiden"
+longitude : "4.46729"
+masterip  : "172.20.136.1"
+monitoring_group: "wleiden"
+nodename  : "AJSoft1"
+nodetype  : "Hybrid"
+rdnap_x   : 92035
+rdnap_y   : 462384
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Wireless link naar AJSoft2"
+  ip         :  "172.16.3.81/30"
+  sdesc      : "ap-il"
+  mode       : "ap"
+  type       : "11a"
+  channel    : 36
+  ssid       : "il-WirelessLeiden-Ajsoft1"
+  wlan_mac   : "a8:54:b2:72:c7:e3"
+  dhcp       : False
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "InterLink naar Stevenshof kabelnr 1"
+  ip         : "172.16.4.65/29"
+  sdesc      : "2stevenshof"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : ""
+  ssid       : "il-nw.ajsoft1.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.4.66/29"
+  ns_mac     : "04:18:d6:54:c8:1e"
+  bridge_type: "NanoBeamM5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "AP voor publiek kabelnr 4"
+  ip         : "172.20.136.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "WiFi-Leiden"
+  dhcp       : "10-250"
+  compass    : " "
+  ns_ip      : "172.20.136.2/24"
+  ns_mac     : "00:15:6d:30:2a:51"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Haagwijk kabelnr 3"
+  ip         : "172.16.5.236/29"
+  sdesc      : "2haagwijk"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-nw.haagwijk.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.5.235/29"
+  ns_mac     : "00:15:6d:ea:eb:d5"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "InterLink naar Robijn kabelnr 2"
+  ip         : "172.16.5.225/29"
+  sdesc      : "2robijn"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "60"
+  ssid       : "il-nnw.ajsoft1.wleiden.net"
+  dhcp       : False
+  compass    : "nnw"
+  ns_ip      : "172.16.5.226/29"
+  ns_mac     : "dc:9f:db:e2:bb:8b"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
Index: nodes/AJSoft2/wleiden.yaml
===================================================================
--- nodes/AJSoft2/wleiden.yaml	(revision 13401)
+++ nodes/AJSoft2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,104 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.14605"
+location  : "Serviceflat De Parelvissers, Bizetpad 4, 2324 JR, Leiden"
+longitude : "4.46729"
+masterip  : "172.20.137.1"
+monitoring_group: "wleiden"
+nodename  : "AJSoft2"
+nodetype  : "Hybrid"
+rdnap_x   : 92035
+rdnap_y   : 462384
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Link naar AJSoft1"
+  ip         : "172.16.3.82/30"
+  sdesc      : "2ajsoft1"
+  mode       : "station"
+  type       : "11a"
+  channel    : "36"
+  ssid       : "il-WirelessLeiden-Ajsoft1"
+  wlan_mac   : "a8:54:b2:72:c7:db"
+  dhcp       : False
+  compass    : "nvt"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar Centrum kabelnr 5"
+  ip         : "172.16.6.49/29"
+  sdesc      : "2centrum"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-no.ajsoft2.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.6.50/29"
+  ns_mac     : "04:18:D6:54:C8:44"
+  bridge_type: "NanobeamM5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar LivingLab kabelnr 8"
+  ip         : "172.16.17.105/29"
+  sdesc      : "2livinglab"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "64"
+  ssid       : "il-z.ajsoft2.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.17.106"
+  ns_mac     : "00:15:6D:71:53:4E"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+iface_vr1:
+  comment    : "Link naar Hofland kabelnr 7"
+  ip         : "172.16.6.41/29"
+  sdesc      : "2hofland"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-zw.ajsoft2.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.6.42/29"
+  ns_mac     : "00:15:6d:ea:f0:6a"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "A-interLink naar RijnVliet kabelnr 6"
+  ip         : "172.16.6.17/29"
+  sdesc      : "2rijnvliet"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-o-ajsoft2.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.6.18/29"
+  ns_mac     : "00:15:6d:ea:f0:6d"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/BCSte/wleiden.yaml
===================================================================
--- nodes/BCSte/wleiden.yaml	(revision 13401)
+++ nodes/BCSte/wleiden.yaml	(revision 13401)
@@ -0,0 +1,79 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.15034"
+location  : "Openbare Bibliotheek locatie Stevenshof, Trix Terwindtstraat 6, 2331 GW, Leiden"
+longitude : "4.45400"
+masterip  : "172.24.0.1"
+monitoring_group: "wleiden"
+nodename  : "BCSte"
+nodetype  : "Hybrid"
+rdnap_x   : 91131
+rdnap_y   : 462873
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap voor de buurt"
+  ip         : "172.24.0.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:00:ec:c4"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet naar unused; local"
+  ip         : "172.16.10.161/29"
+  sdesc      : "eth"
+  type       : "eth"
+  dhcp       : False
+  status     : "down"
+
+
+#iface_vr1:
+#  comment    : "B-link naar Zwaluw DOWN"
+#  ip         : "172.16.3.249/29"
+#  sdesc      : "2zwaluwak"
+#  mode       : "station-wds"
+#  type       : "eth"
+#  extra_type : "eth2wifibridge"
+#  channel    : "1"
+#  ssid       : "il-nw.bcste.wleiden.net"
+#  dhcp       : False
+#  compass    : "nw"
+#  ns_ip      : "172.16.3.250/29"
+#  ns_mac     : "00:15:6d:e8:e6:9f"
+#  bridge_type: "NanoStation M5"
+#  status     : "down"
+
+
+iface_vr2:
+  comment    : "Interlink o (Vosko2)"
+  ip         : "172.16.3.153/29"
+  sdesc      : "2vosko2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-w.vosko2.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.3.154/29"
+  ns_mac     : "00:15:6d:f6:be:e6"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/Boterhuis/wleiden.yaml
===================================================================
--- nodes/Boterhuis/wleiden.yaml	(revision 13401)
+++ nodes/Boterhuis/wleiden.yaml	(revision 13401)
@@ -0,0 +1,108 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+height    : "8"
+ileiden   : True
+latitude  : "52.18753"
+location  : "Zeeverkennerscentrum Kagerplassen, Boterhuiseiland"
+longitude : "4.52255"
+masterip  : "172.17.31.1"
+monitoring_group: "wleiden"
+nodename  : "Boterhuis"
+nodetype  : "Hybrid"
+portal_sponsor: "Stichting Zeeverkennerscentrum Kagerplassen"
+portal_url: "http://www.kagerplassen.scouting.nl/"
+rdnap_x   : 95872
+rdnap_y   : 466952
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor de buurt"
+  ip         : "172.17.31.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Boterhuis"
+  wlan_mac   : "90:a4:de:8b:e3:1c"
+  dhcp       : "10-100"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Ap2 omni"
+  ip         : "172.17.32.1/24"
+  sdesc      : "ap2"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "WiFi-Boterhuis-2"
+  dhcp       : "10-100"
+  compass    : "-"
+  bullet2_ip : "172.17.32.2/24"
+  bullet2_mac: "00:27:22:f2:f2:b3"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet to PanTerra2 il-355"
+  ip         : "172.16.10.76/29"
+  sdesc      : "2panterra2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-355.panterra2.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.10.75/29"
+  ns_mac     : "00:27:22:10:f6:01"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar TEYOudeRaadhuis"
+  ip         : "172.16.6.177/29"
+  sdesc      : "2ouderaadhuis"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-w.boterhuis.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.6.178/29"
+  ns_mac     : "00:27:22:8a:3d:b6"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Meelfabriek1"
+  ip         : "172.16.9.212/29"
+  sdesc      : "2meelfab1"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-nw.meelfabriek1.wleiden.net"
+  dhcp       : False
+  compass    : "207"
+  ns_ip      : "172.16.9.211/29"
+  ns_mac     : "00:27:22:10:fe:31"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
Index: nodes/Broekplein/wleiden.yaml
===================================================================
--- nodes/Broekplein/wleiden.yaml	(revision 13401)
+++ nodes/Broekplein/wleiden.yaml	(revision 13401)
@@ -0,0 +1,96 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.17972"
+location  : "Basisschool De Tweemaster, Broekplein 1, 2318 TJ, Leiden"
+longitude : "4.50232"
+masterip  : "172.21.144.1"
+monitoring_group: "wleiden"
+nodename  : "Broekplein"
+nodetype  : "Hybrid"
+rdnap_x   : 94478
+rdnap_y   : 466100
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor de buurt"
+  ip         : "172.21.144.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:05:02:f7"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Ethernet naar tweemaster"
+  ip         : "172.16.6.65/29"
+  sdesc      : "eth"
+  type       : "eth"
+  dhcp       : False
+  status     : "down"
+
+
+iface_vr0:
+  comment    : "A-link naar SOM1"
+  ip         : "172.16.5.124/29"
+  sdesc      : "2som1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-n.som1.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.5.123/29"
+  ns_mac     : "00:15:6d:ec:82:8d"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Rosmolen"
+  ip         : "172.16.5.129/29"
+  sdesc      : "2rosmolen"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-z.broekplein.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.5.130/29"
+  ns_mac     : "00:15:6d:ec:82:05"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Lijtweg 2"
+  ip         : "172.16.5.140/29"
+  sdesc      : "2lijtweg2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-ozo.lijtweg2.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.5.139/29"
+  ns_mac     : "00:15:6d:ec:82:79"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/Cam/wleiden.yaml
===================================================================
--- nodes/Cam/wleiden.yaml	(revision 13401)
+++ nodes/Cam/wleiden.yaml	(revision 13401)
@@ -0,0 +1,87 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.16622"
+location  : "CamBioCeramics, Zernikedreef 6, 2333 CL, Leiden"
+longitude : "4.47068"
+masterip  : "172.19.174.1"
+monitoring_group: "wleiden"
+nodename  : "Cam"
+nodetype  : "Hybrid"
+rdnap_x   : 92295
+rdnap_y   : 464625
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Omni voor de buurt"
+  ip         : "172.19.174.1/24"
+  sdesc      : "omni"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Leiden"
+  dhcp       : "10-250"
+  compass    : "no"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Extra ap"
+  ip         : "172.17.46.1/24"
+  sdesc      : "ap2"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "WiFi-Leiden-2"
+  dhcp       : "10-250"
+  compass    : "n"
+  ns_ip      : "172.17.46.2/24"
+  ns_mac     : "00:15:6d:e8:e7:60"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Extra ap"
+  ip         : "172.17.47.1/24"
+  sdesc      : "ap2"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "3"
+  ssid       : "WiFi-Leiden-3"
+  dhcp       : "10-250"
+  compass    : "n"
+  ns_ip      : "172.17.47.2/24"
+  ns_mac     : "00:00:00:00:00:00"
+  bridge_type: "Bullet2"
+  status     : "down"
+
+
+iface_vr2:
+  comment    : "Link naar DirkLos1"
+  ip         : "172.16.4.92/29"
+  sdesc      : "2dirklos1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-zw.dirklos1.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.4.91/29"
+  ns_mac     : "00:15:6d:bd:69:30"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/Carlton/wleiden.yaml
===================================================================
--- nodes/Carlton/wleiden.yaml	(revision 13401)
+++ nodes/Carlton/wleiden.yaml	(revision 13401)
@@ -0,0 +1,107 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+externalif: "vr0"
+gateway   : "192.168.13.254"
+ileiden   : True
+latitude  : "52.27111"
+location  : "De Carlton, Kraaierslaan 13, 2204AN, Noordwijk"
+longitude : "4.47666"
+masterip  : "172.17.71.1"
+monitoring_group: "noordwijk"
+nodename  : "Carlton"
+nodetype  : "Hybrid"
+portal_sponsor: "Camping De Carlton"
+portal_url: "http://www.campingcarlton.nl"
+rdnap_x   : 92851
+rdnap_y   : 476289
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "down"
+
+
+iface_ue0:
+  comment    : "AP sector oost"
+  ip         : "172.17.71.1/24"
+  sdesc      : "2oost"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "11"
+  ssid       : "ap-DeCarlton-oost"
+  dhcp       : "10-250"
+  compass    : "o"
+  ns_ip      : "172.17.71.2/24"
+  ns_mac     : ""
+  ns_type    : "RocketM2"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "External Link"
+  ip         : "0.0.0.0/24"
+  sdesc      : "2external"
+  type       : "eth"
+  dhcp       : "client"
+  status     : "up"
+
+
+iface_vr0_alias0:
+  comment    : "Link naar external gateway 192.168.13.225 via NanoM5 192.168.13.16"
+  ip         : "192.168.13.17/24"
+  sdesc      : "2external"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "Carlton-NW"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "192.168.13.16/24"
+  ns_mac     : ""
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "AP sector west"
+  ip         : "172.17.72.1/24"
+  sdesc      : "2west"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "ap-DeCarlton-west"
+  dhcp       : "10-250"
+  compass    : "w"
+  ns_ip      : "172.17.72.2/24"
+  ns_mac     : ""
+  ns_type    : "RocketM2"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Ap sector noord en sector noordoost via wds"
+  ip         : "172.17.73.1/24"
+  sdesc      : "2noord"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "ap-DeCarlton-noord"
+  dhcp       : "10-250"
+  ns_ip      : "172.17.73.2/24"
+  ns_mac     : ""
+  ns_type    : "RocketM2"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
Index: nodes/Catwalk/wleiden.yaml
===================================================================
--- nodes/Catwalk/wleiden.yaml	(revision 13401)
+++ nodes/Catwalk/wleiden.yaml	(revision 13401)
@@ -0,0 +1,93 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.16218"
+location  : "Catwalk, Steenstraat 30, 2312BW, Leiden"
+longitude : "4.48487"
+masterip  : "172.17.112.1"
+monitoring_group: "leiden"
+nodename  : "Catwalk"
+nodetype  : "Hybrid"
+portal_sponsor: "De Catwalk koffie & lunch"
+portal_url: "http://www.decatwalk.nl/"
+rdnap_x   : 93260
+rdnap_y   : 464163
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ue0:
+  comment    : "Accesspoint 1 kabel 3"
+  ip         : "172.17.112.1/24"
+  sdesc      : "2ap1"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "ap-WirelessLeiden-Catwalk1"
+  dhcp       : "10-250"
+  compass    : "z"
+  ns_ip      : "172.17.112.2/24"
+  ns_mac     : "dc:9f:db:36:db:c4"
+  bridge_type: "NanostationM2Loco"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar NNO - VisitorCentre2 kabel 1"
+  ip         : "172.16.7.188/29"
+  sdesc      : "2vcentre2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "136"
+  ssid       : "il-z.visitorcentre2.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.7.187/29"
+  ns_mac     : "dc:9f:db:64:23:9f"
+  bridge_type: "NanostationM5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar NO kabel 2"
+  ip         : "172.16.7.193/29"
+  sdesc      : "2no"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-no.catwalk.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.7.194/29"
+  ns_mac     : "dc:9f:db:64:23:5a"
+  bridge_type: "NanostationM5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Accesspoint 2 oostzijde kabel 4"
+  ip         : "172.17.113.1/24"
+  sdesc      : "ap2"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "WiFi-Leiden"
+  dhcp       : "10-250"
+  compass    : "o"
+  ns_ip      : "172.17.113.2/24"
+  ns_mac     : "dc:9f:db:36:db:1b"
+  bridge_type: "NanostationM2Loco"
+  status     : "up"
+
+
Index: nodes/CeTIM1/wleiden.yaml
===================================================================
--- nodes/CeTIM1/wleiden.yaml	(revision 13401)
+++ nodes/CeTIM1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,114 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.15797"
+location  : "Hooglandse Kerk, Middelweg 2, 2312 KG, Leiden"
+longitude : "4.49423"
+masterip  : "172.17.136.1"
+monitoring_group: "wleiden"
+nodename  : "CeTIM1"
+nodetype  : "Hybrid"
+rdnap_x   : 93895
+rdnap_y   : 463687
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP CeTIM richting N en O"
+  ip         : "172.17.136.1/24"
+  sdesc      : "ap-no"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:02:bf:02"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "A-link Nanostation5 Zuid-Oost"
+  ip         : "172.16.16.81/29"
+  sdesc      : "2heineken"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-nw.heineken.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.16.82/29"
+  ns_mac     : "00:15:6d:f6:be:66"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_ue1:
+  comment    : "Link naar Stadhuis"
+  ip         : "172.16.4.172/29"
+  sdesc      : "2stadhuis"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-o.stadhuis.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.4.171"
+  ns_mac     : "00:15:6d:f2:38:9a"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "External Link"
+  ip         : "10.0.1.12/24"
+  sdesc      : "2external"
+  type       : "eth"
+  dhcp       : False
+  status     : "down"
+
+
+iface_vr0_alias0:
+  comment    : "Ethernet naar CeTIM3"
+  ip         : "172.17.0.21/30"
+  sdesc      : "2cetim3"
+  type       : "eth"
+  dhcp       : False
+  status     : "down"
+
+
+iface_vr1:
+  comment    : "Ethernet naar CeTIM2"
+  ip         : "172.16.0.33/30"
+  sdesc      : "2cetim2"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "A-link Nanostation5 Noord-Oost"
+  ip         : "172.16.17.145/29"
+  sdesc      : "houtmarkt"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "120"
+  ssid       : "il-no.cetim1.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.17.146"
+  ns_mac     : "00:15:6d:f6:be:e4"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/CeTIM2/wleiden.yaml
===================================================================
--- nodes/CeTIM2/wleiden.yaml	(revision 13401)
+++ nodes/CeTIM2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,113 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.15797"
+location  : "Hooglandse Kerk, Middelweg 2, 2312 KG, Leiden"
+longitude : "4.49423"
+masterip  : "172.17.137.1"
+monitoring_group: "wleiden"
+nodename  : "CeTIM2"
+nodetype  : "Hybrid"
+rdnap_x   : 93895
+rdnap_y   : 463687
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "CeTIM AP richting Z en W"
+  ip         : "172.17.137.1/24"
+  sdesc      : "zw"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:02:bf:5f"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Ethernet naar lokaal AP"
+  ip         : "172.17.139.1/24"
+  sdesc      : "lokaalAP"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "WiFi-Leiden"
+  dhcp       : "10-60"
+  ns_ip      : "172.17.139.2/24"
+  ns_mac     : "00:15:6d:fc:4d:60"
+  bridge_type: "NanoStation2"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet naar CeTIM1"
+  ip         : "172.16.0.34/30"
+  sdesc      : "2cetim1"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "A-link Noord-West naar Rabo1"
+  ip         : "172.16.4.100/29"
+  sdesc      : "2rabo1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "136"
+  ssid       : "il-z.rabo1.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.4.99/29"
+  ns_mac     : "00:15:6d:f2:36:5d"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar IMI"
+  ip         : "172.16.16.249/29"
+  sdesc      : "2imi"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-zw.cetim2.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.16.250/29"
+  ns_mac     : "00:15:6d:f2:37:bd"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2_alias0:
+  comment    : "Link naar Victoria"
+  ip         : "172.16.17.201/29"
+  sdesc      : "2victoria"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr2_alias1:
+  comment    : "Link naar Huub"
+  ip         : "172.16.4.25/29"
+  sdesc      : "2huub"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
Index: nodes/CeTIM3/wleiden.yaml
===================================================================
--- nodes/CeTIM3/wleiden.yaml	(revision 13401)
+++ nodes/CeTIM3/wleiden.yaml	(revision 13401)
@@ -0,0 +1,41 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.15797"
+location  : "Hooglandse Kerk, Middelweg 2, 2312 KG, Leiden"
+longitude : "4.49423"
+masterip  : "172.17.0.22"
+monitoring_group: "wleiden"
+nodename  : "CeTIM3"
+nodetype  : "Hybrid"
+rdnap_x   : 93895
+rdnap_y   : 463687
+release   : "9.0-RELEASE"
+service_accesspoint: False
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "down"
+
+
+iface_vr0:
+  comment    : "Ethernet naar CeTIM1 via switch"
+  ip         : "172.17.0.22/30"
+  sdesc      : "2cetim1"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Ethernet naar kerk voor video upload"
+  ip         : "192.168.3.1/24"
+  sdesc      : "2video"
+  type       : "eth"
+  dhcp       : "10-250"
+  status     : "up"
+
+
Index: nodes/Cope/wleiden.yaml
===================================================================
--- nodes/Cope/wleiden.yaml	(revision 13401)
+++ nodes/Cope/wleiden.yaml	(revision 13401)
@@ -0,0 +1,97 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+externalif: "ue0"
+latitude  : "52.15972"
+location  : "Cope, Rapenburg 8, 2311 EV, Leiden"
+longitude : "4.48521"
+masterip  : "172.17.8.1"
+monitoring_group: "wleiden"
+nodename  : "Cope"
+nodetype  : "Hybrid"
+rdnap_x   : 93280
+rdnap_y   : 463889
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor de buurt"
+  ip         : "172.17.8.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:05:02:ec"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "internetverbinding niet in gebruik"
+  ip         : "0.0.0.0/24"
+  sdesc      : "2local"
+  type       : "eth"
+  dhcp       : False
+  status     : "down"
+
+
+iface_vr0:
+  comment    : "A-link naar Stadhuis  via NS5"
+  ip         : "172.16.3.180/29"
+  sdesc      : "2stadhuis"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-nw.stadhuis.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.3.179/29"
+  ns_mac     : "00:15:6d:ea:f0:4c"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Ethernet to interlink UniGor1"
+  ip         : "172.16.3.188/29"
+  sdesc      : "2unigor1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "128"
+  ssid       : "il-zo.unigor.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.3.187/29"
+  ns_mac     : "00:15:6d:ea:f0:1d"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "A-link naar VisitorCentre2"
+  ip         : "172.16.7.60/29"
+  sdesc      : "2visitorc2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-z.visitorcentre2.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.7.59/29"
+  ns_mac     : "00:15:6d:ea:f0:0f"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/DeClercq/wleiden.yaml
===================================================================
--- nodes/DeClercq/wleiden.yaml	(revision 13401)
+++ nodes/DeClercq/wleiden.yaml	(revision 13401)
@@ -0,0 +1,97 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+gateway   : "213.125.162.249"
+latitude  : "52.15060"
+location  : "kantoor De Clercq, Hoge Rijndijk 306, 2314 AM, Leiden"
+longitude : "4.52066"
+masterip  : "172.18.128.1"
+monitoring_group: "wleiden"
+nodename  : "DeClercq"
+nodetype  : "Hybrid"
+rdnap_x   : 95694
+rdnap_y   : 462845
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: True
+service_proxy_normal: True
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor de buurt"
+  ip         : "172.18.128.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:00:ed:6e"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar noordwest"
+  ip         : "172.16.6.81/29"
+  sdesc      : "2nw"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-nw.declercq.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.6.82/29"
+  ns_mac     : "00:15:6d:ea:f0:63"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar Router Ziggo 40/8"
+  ip         : "213.125.162.253/29"
+  sdesc      : "uplink"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link west naar Roomburgh2"
+  ip         : "172.16.5.177/29"
+  sdesc      : "2roomburgh2"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-w.declercq.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.5.178/29"
+  ns_mac     : "00:15:6d:ea:f0:70"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link to Leythenrode"
+  ip         : "172.16.5.172/29"
+  sdesc      : "2leythenrode"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-zw.leythenrode.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.5.171/29"
+  ns_mac     : "00:15:6d:ea:f0:7b"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/DeKijker/wleiden.yaml
===================================================================
--- nodes/DeKijker/wleiden.yaml	(revision 13401)
+++ nodes/DeKijker/wleiden.yaml	(revision 13401)
@@ -0,0 +1,108 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+latitude  : "52.16740"
+location  : "De Kijker, , Leiden"
+longitude : "4.48229"
+masterip  : "172.17.86.1"
+monitoring_group: "wleiden"
+nodename  : "DeKijker"
+nodetype  : "Hybrid"
+portal_sponsor: "Visitor Centre Leiden"
+portal_url: "http://portal.leiden.nl/"
+rdnap_x   : 93091
+rdnap_y   : 464747
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+iface_ath0:
+  comment    : "PA 5 GHz voor Stationsplein"
+  ip         : "172.17.82.1/24"
+  sdesc      : "2ap5GHz"
+  mode       : "ap"
+  type       : "11a"
+  channel    : 52
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:02:bf:79"
+  dhcp       : "10-240"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Ap-west sectorantenne 120 graden kabel 3 "
+  ip         : "172.17.86.1/24"
+  sdesc      : "2apw"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "WiFi-Leiden"
+  dhcp       : "10-240"
+  ns_ip      : "172.17.86.2/24"
+  ns_mac     : "dc:9f:db:0c:30:26"
+  bridge_type: "RocketM2"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar VisitorCentre kabel 4"
+  ip         : "172.16.7.185/29"
+  sdesc      : "2vc"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : ""
+  ssid       : "il-zzo.dekijker.wleiden.net"
+  dhcp       : False
+  compass    : "zzo"
+  ns_ip      : "172.16.7.186"
+  ns_mac     : "04:18:d6:ca:fd:bf"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+iface_vr0_alias0:
+  comment    : "Interlink naar Catwalk"
+  ip         : "172.16.5.185/29"
+  sdesc      : "2catwalk"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr1:
+  comment    : "Link naar noordwest lijtweg2 kabel 1"
+  ip         : "172.16.6.100/29"
+  sdesc      : "2Lijtweg2"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "64"
+  ssid       : "il-z.lijtweg2.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.6.99/29"
+  ns_mac     : "04:18:d6:cc:09:4b"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Geluidsnet1 kabel 2"
+  ip         : "172.16.7.44/29"
+  sdesc      : "2geluidsnet1"
+  mode       : "station-wds"
+  type       : "eth"
+  channel    : "36"
+  ssid       : "il-n.geluidsnet1.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.7.43/29"
+  ns_mac     : "04:18:d6:ca:fe:b2"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
Index: nodes/DirkLos1/wleiden.yaml
===================================================================
--- nodes/DirkLos1/wleiden.yaml	(revision 13401)
+++ nodes/DirkLos1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,106 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.16732"
+location  : "Hogeschool Leiden, Zernikedreef 11, 2333 CK, Leiden"
+longitude : "4.47071"
+masterip  : "172.19.131.1"
+monitoring_group: "wleiden"
+nodename  : "DirkLos1"
+nodetype  : "Hybrid"
+rdnap_x   : "092299"
+rdnap_y   : 464748
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap noord"
+  ip         : "172.17.45.1/24"
+  sdesc      : "2ap2"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:00:ec:5c"
+  dhcp       : "10-250"
+  compass    : "e"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Ethernet naar DirkLos2"
+  ip         : "172.16.3.58/30"
+  sdesc      : "2DLos2"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_ue0_alias0:
+  comment    : "Local Ethernet"
+  ip         : "172.16.176.66/27"
+  sdesc      : "localeth"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet to interlink oost"
+  ip         : "172.16.4.156/29"
+  sdesc      : "2geluidsnet1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-zw.geluidsnet1.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.4.155/29"
+  ns_mac     : "00:15:6d:f6:be:ff"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Ethernet to interlink south-east (Vosko3)"
+  ip         : "172.16.4.76/29"
+  sdesc      : "2Vosko3"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-wnw.vosko3.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.4.75/29"
+  ns_mac     : "00:15:6d:f6:be:eb"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Ethernet to interlink west (Cam)"
+  ip         : "172.16.4.89/29"
+  sdesc      : "2cam"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-zw.dirklos1.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.4.90/29"
+  ns_mac     : "00:15:6d:70:53:52"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/DirkLos2/wleiden.yaml
===================================================================
--- nodes/DirkLos2/wleiden.yaml	(revision 13401)
+++ nodes/DirkLos2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,105 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.16732"
+location  : "Hogeschool Leiden, Zernikedreef 11, 2333 CK, Leiden"
+longitude : "4.47071"
+masterip  : "172.19.132.1"
+monitoring_group: "wleiden"
+nodename  : "DirkLos2"
+nodetype  : "Hybrid"
+rdnap_x   : "092299"
+rdnap_y   : 464748
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP1 voor de buurt"
+  ip         : "172.19.132.1/24"
+  sdesc      : "ap1"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Leiden-1"
+  wlan_mac   : "00:1b:b1:00:ec:60"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Local Ethernet naar DirkLos1"
+  ip         : "172.16.3.57/30"
+  sdesc      : "eth_to_DirkLos1"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_ue0_alias0:
+  comment    : "Local Ethernet naar Hogeschool"
+  ip         : "172.16.176.65/27"
+  sdesc      : "eth_to_Hogeschool"
+  type       : "eth"
+  dhcp       : "70-94"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet naar interlink west (unigor2)"
+  ip         : "172.16.4.4/29"
+  sdesc      : "2Unigor2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "149"
+  ssid       : "il-o.unigor2.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.4.3/29"
+  ns_mac     : "00:15:6d:d0:14:c3"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Ethernet naar interlink noord-oost Rabo2"
+  ip         : "172.16.3.217/29"
+  sdesc      : "2Rabo2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-no.dirklos2.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.3.218/29"
+  ns_mac     : "00:15:6d:b5:24:4f"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Ethernet naar interlink zuid-oost (stadhuis)"
+  ip         : "172.16.3.76/29"
+  sdesc      : "2Stadhuis"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-nw.stadhuis2.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.3.75/29"
+  ns_mac     : "00:15:6d:b5:25:65"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/Drijfhuis/wleiden.yaml
===================================================================
--- nodes/Drijfhuis/wleiden.yaml	(revision 13401)
+++ nodes/Drijfhuis/wleiden.yaml	(revision 13401)
@@ -0,0 +1,83 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.26387"
+location  : "Jachthaven Drijfhuis,Uiterweg 27, 1431 AA,Aalsmeer"
+longitude : "4.74555"
+masterip  : "172.17.12.1"
+monitoring_group: "wleiden"
+nodename  : "Drijfhuis"
+nodetype  : "Hybrid"
+rdnap_x   : "111196"
+rdnap_y   : "475288"
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "OMNI voor Wifi op de Drijfhuis"
+  ip         : "172.17.12.1/24"
+  sdesc      : "ap-omni"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Westeinder"
+  wlan_mac   : "00:1b:b1:ac:1e:0f"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar Watertoren2"
+  ip         : "172.16.16.36/29"
+  sdesc      : "2watertoren2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-nw-2.watertoren2.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.16.35"
+  ns_mac     : "00:15:6d:70:50:04"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Subnet naar bullet"
+  ip         : "172.17.0.193/26"
+  sdesc      : "2ring"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "WiFi-Westeinder-3"
+  dhcp       : "200-220"
+  ns_ip      : "172.17.0.194/26"
+  ns_mac     : "00:15:6d:e8:e6:e0"
+  bridge_type: "Bullet2"
+  status     : "down"
+
+
+iface_vr2:
+  comment    : "Subnet naar nanoM2"
+  ip         : "172.17.0.129/26"
+  sdesc      : "2ring"
+  mode       : "ap"
+  type       : "eth"
+  channel    : "11"
+  ssid       : "WiFi-Westeinder-2"
+  dhcp       : "133-190"
+  ns_ip      : "172.17.0.130/26"
+  ns_mac     : "00:27:22:80:5c:86"
+  bridge_type: "NanoStation M2"
+  status     : "up"
+
+
Index: nodes/Ed/wleiden.yaml
===================================================================
--- nodes/Ed/wleiden.yaml	(revision 13401)
+++ nodes/Ed/wleiden.yaml	(revision 13401)
@@ -0,0 +1,93 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "net4801"
+comment   : "None"
+externalif: "sis0"
+latitude  : "51.46017"
+location  : "Ed, Wittezeestraat 43, 4388 GE, Oost-Souburg"
+longitude : "3.59545"
+masterip  : "172.17.76.1"
+monitoring_group: "wleiden"
+nodename  : "Ed"
+nodetype  : "Hybrid"
+rdnap_x   : 30486
+rdnap_y   : 387207
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False 
+service_proxy_normal: False 
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Accesspoint voor de buurt"
+  ip         : "172.17.76.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11 
+  ssid       : "ap-VLI-Ed"
+  dhcp       : "10-60"
+  status     : "up"
+
+iface_sis0:
+  comment    : "Link naar Ed2"
+  ip         : "172.16.3.65/29"
+  sdesc      : "ethernet"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_sis1:
+  comment    : "Link naar het Zuiden"
+  ip         : "172.17.0.49/29"
+  sdesc      : "2zuiden"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-z.ed.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.17.0.50/29"
+  ns_mac     : "00:27:22:10:f5:a4"
+  bridge_type: "NanoStation M5"
+  status     : "down"
+
+
+iface_sis2:
+  comment    : "Link to vpn box"
+  ip         : "172.17.36.22/24"
+  sdesc      : "2vpn-ed"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_sis2_alias0:
+  comment    : "Link to Rick2"
+  ip         : "172.17.2.249/29"
+  sdesc      : "2rick2"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_ue0:
+  comment    : "Link naar het Noord"
+  ip         : "172.17.0.57/29"
+  sdesc      : "2noorden"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-z.ed.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.17.0.58/29"
+  ns_mac     : "00:27:22:10:f6:34"
+  bridge_type: "NanoStation M5"
+  status     : "down"
+
Index: nodes/Ed2/wleiden.yaml
===================================================================
--- nodes/Ed2/wleiden.yaml	(revision 13401)
+++ nodes/Ed2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,68 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+gateway   : "10.20.30.1"
+latitude  : "51.46017"
+location  : "Ed Kikkert, Wittezeestraat 43 ,4388 GE, Oost-Souburg"
+longitude : "3.59545"
+masterip  : "172.17.157.1"
+monitoring_group: "wleiden"
+nodename  : "Ed2"
+nodetype  : "Hybrid"
+rdnap_x   : 30486 
+rdnap_y   : 387207
+release   : "10.1-RELEASE"
+remote_access: ""
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False 
+service_proxy_normal: False 
+status    : "down"
+
+iface_ath0:
+  comment    : "Internal Wireless"
+  ip         : "172.17.157.1/24"
+  sdesc      : "binnen"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "ap-WirelessLeiden-TEST"
+  dhcp       : "10-60"
+  status     : "up"
+
+iface_re0:
+  comment    : "Link naar Ed"
+  ip         : "172.16.3.66/29"
+  sdesc      : "ethernet"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_re1:
+  comment    : "Link naar wleiden.net"
+  ip         : "172.16.10.41/29"
+  sdesc      : "2wleiden"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "120"
+  ssid       : "il.test.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.10.42/29"
+  ns_mac     : "00:15:6d:8e:dd:84"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+iface_re2:
+  comment    : "Lokaal Dev Netwerk"
+  ip         : "192.168.10.11/24"
+  sdesc      : "2dev"
+  type       : "eth"
+  dhcp       : "11-20"
+  status     : "up"
+
+
Index: nodes/GHR/wleiden.yaml
===================================================================
--- nodes/GHR/wleiden.yaml	(revision 13401)
+++ nodes/GHR/wleiden.yaml	(revision 13401)
@@ -0,0 +1,93 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.166297"
+location  : "Groene Hart Recreatie Hofdijklaan 63, 2374 BS Oud-Ade"
+longitude : "4.5505"
+masterip  : "172.17.149.1"
+monitoring_group: "leiden"
+nodename  : "GHR"
+nodetype  : "Hybrid"
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+portal_sponsor: "Groene Hart Recreatie"
+portal_url: "http://www.groenehart-recreatie.nl"
+
+
+iface_ath0:
+  comment    : "Omni voor Buurt MGMT"
+  ip         : "172.17.149.1/24"
+  sdesc      : "2buurt"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "ap-GHR-Management"
+  dhcp       : "10-240"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar StBavo2"
+  ip         : "172.16.3.124/29"
+  sdesc      : "2stbavo"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-zo.stbavo2.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.3.123/29"
+  ns_mac     : "00:00:00:00:00:00"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Accesspoint West"
+  ip         : "172.17.150.1/24"
+  sdesc      : "2ap-w"
+  mode       : "ap-wds"
+  type       : "eth"
+  ssid       : "ap-GroeneHart-West"
+  dhcp       : "10-240"
+  ns_ip      : "172.17.150.2/24"
+  ns_mac     : "00:00:00:00:00:00"
+  bridge_type: "NanoStation M2"
+  status     : "up"
+
+iface_vr2:
+  comment    : "Accesspoint Oost"
+  ip         : "172.17.151.1/24"
+  sdesc      : "2buurt"
+  mode       : "ap-wds"
+  type       : "eth"
+  ssid       : "ap-GroeneHart-Oost"
+  dhcp       : "10-240"
+  ns_ip      : "172.17.151.2/24"
+  ns_mac     : "00:00:00:00:00:00"
+  bridge_type: "NanoStation M2"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar Boterhuis (client soonish)"
+  ip         : "172.16.7.68/29"
+  sdesc      : "2boterhuis"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-nw.ghr.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.7.67/29"
+  ns_mac     : "00:00:00:00:00:00"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
Index: nodes/Geluidsnet1/wleiden.yaml
===================================================================
--- nodes/Geluidsnet1/wleiden.yaml	(revision 13401)
+++ nodes/Geluidsnet1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,100 @@
+
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.16254"
+location  : "Oude Belastingkantoor, Stationsplein 107, 2312 AJ, Leiden"
+longitude : "4.47908"
+masterip  : "172.17.3.1"
+monitoring_group: "wleiden"
+nodename  : "Geluidsnet1"
+nodetype  : "Hybrid"
+rdnap_x   : 92865
+rdnap_y   : 464209
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+iface_ath0:
+  comment    : "Ap"
+  ip         : "172.17.3.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:02:bf:55"
+  dhcp       : "10-250"
+  status     : "up"
+
+iface_ue0:
+  comment    : "Link naar Geluidsnet2"
+  ip         : "172.16.4.185/30"
+  sdesc      : "2geluidsnet2"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr0:
+  comment    : "Link naar Webcam"
+  ip         : "172.16.16.1/30"
+  sdesc      : "2webcam"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr1:
+  comment    : "Link naar Lebkov"
+  ip         : "172.16.17.225/29"
+  sdesc      : "2lebkov"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-n.geluidsnet1.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.17.226/29"
+  ns_mac     : "00:15:6d:ec:82:8c"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+iface_vr1_alias0:
+  comment    : "Link naar DeKijker"
+  ip         : "172.16.7.41/29"
+  sdesc      : "2dekijker"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr1_alias1:
+  comment    : "Link naar Rabo2"
+  ip         : "172.16.3.193/29"
+  sdesc      : "2rabo2"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr2:
+  comment    : "Link naar Dirklos1 "
+  ip         : "172.16.4.153/29"
+  sdesc      : "2dirklos1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-zw.geluidsnet1.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.4.154/29"
+  ns_mac     : "00:15:6d:ec:81:7b"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/Geluidsnet2/wleiden.yaml
===================================================================
--- nodes/Geluidsnet2/wleiden.yaml	(revision 13401)
+++ nodes/Geluidsnet2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,97 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.16200"
+location  : "Oude Belastingkantoor, Stationsplein 107, 2312 AJ, Leiden"
+longitude : "4.48003"
+masterip  : "172.17.5.1"
+monitoring_group: "wleiden"
+nodename  : "Geluidsnet2"
+nodetype  : "Hybrid"
+rdnap_x   : 92929
+rdnap_y   : 464148
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap"
+  ip         : "172.17.5.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "90:a4:de:b7:ae:6b"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar Webster"
+  ip         : "172.16.4.193/29"
+  sdesc      : "2webster"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-z.geluidsnet2.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.4.194/29"
+  ns_mac     : "00:15:6d:70:4d:6a"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar Geluidsnet1"
+  ip         : "172.16.4.186/30"
+  sdesc      : "2geluidsnet1"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar xxxx"
+  ip         : "172.16.9.81/29"
+  sdesc      : "2xxx"
+  mode       : "station-wds"
+  type       : "eth"
+  channel    : "36"
+  ssid       : "il-zo.geluidsnet2.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.9.82/29"
+  ns_mac     : "00:15:6d:70:4d:a3"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar vosko3"
+  ip         : "172.16.4.204/29"
+  sdesc      : "2vosko3"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-wnw.vosko3.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.4.203/29"
+  ns_mac     : "00:15:6d:ec:82:96"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/Graficall/wleiden.yaml
===================================================================
--- nodes/Graficall/wleiden.yaml	(revision 13401)
+++ nodes/Graficall/wleiden.yaml	(revision 13401)
@@ -0,0 +1,122 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+height    : "17"
+latitude  : "52.15630"
+location  : "Zusterflat Ziekenhuis Rijnland, Simon Smitweg 1, 2353 GA, Leiderdorp"
+longitude : "4.53926"
+masterip  : "172.24.16.1"
+monitoring_group: "wleiden"
+nodename  : "Graficall"
+nodetype  : "Hybrid"
+rdnap_x   : "96974"
+rdnap_y   : "463464"
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor de buurt"
+  ip         : "172.24.16.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Leiderdorp"
+  wlan_mac   : "00:1b:b1:02:bd:e9"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar WBRotary"
+  ip         : "172.16.18.41/29"
+  sdesc      : "2wbrotary"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-o.graficall.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.18.42/29"
+  ns_mac     : "00:27:22:10:f6:0b"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_ue1:
+  comment    : "AP2 to Rijnlandsziekenhuis via Bullet2; adapter verwijderd"
+  ip         : "172.17.18.1/24"
+  sdesc      : "2ap2"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "WiFi-Leiderdorp-2"
+  dhcp       : "10-250"
+  compass    : "n"
+  ns_ip      : "172.17.18.2/24"
+  ns_mac     : "00:15:6d:d4:f8:40"
+  bridge_type: "Bullet2"
+  status     : "down"
+
+
+iface_vr0:
+  comment    : "Ethernet to interlink northeast of Leythenrode"
+  ip         : "172.16.5.148/29"
+  sdesc      : "2Leythenrode"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-no.leythenrode.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.5.147/29"
+  ns_mac     : "00:15:6d:bd:68:9d"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link zw JVC"
+  ip         : "172.16.3.12/29"
+  sdesc      : "2jvc"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-no.jvc.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.3.11"
+  ns_mac     : "04:18:d6:56:ae:0c"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar PanTerra2"
+  ip         : "172.16.10.49/29"
+  sdesc      : "2panterra2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-nw.graficall.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.10.50"
+  ns_mac     : "04:18:d6:56:a5:bc"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
Index: nodes/Grip/wleiden.yaml
===================================================================
--- nodes/Grip/wleiden.yaml	(revision 13401)
+++ nodes/Grip/wleiden.yaml	(revision 13401)
@@ -0,0 +1,86 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.14730"
+location  : "Stichting Werk en Onderneming, Frambozenweg 5, 2321 KA, Leiden"
+longitude : "4.48863"
+masterip  : "172.21.8.1"
+monitoring_group: "wleiden"
+nodename  : "Grip"
+nodetype  : "Hybrid"
+rdnap_x   : 93497
+rdnap_y   : 462505
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Omni (dubbele waveguide)"
+  ip         : "172.21.8.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:00:eb:b4"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "A-link naar vosko1"
+  ip         : "172.16.16.60/29"
+  sdesc      : "2vosko1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-zw.vosko1.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.16.59/29"
+  ns_mac     : "00:15:6d:70:50:09"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar ROC2"
+  ip         : "172.16.5.29/29"
+  sdesc      : "2roc2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-nw.roc2.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "192.168.1.20/24"
+  ns_mac     : "00:15:6d:ad:34:35"
+  bridge_type: "NanoStation M5"
+  status     : "down"
+
+
+iface_vr2:
+  comment    : "Link naar LCPL via Bullet2"
+  ip         : "172.16.1.1/30"
+  sdesc      : "2lcpl"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "8"
+  ssid       : "il-zw.grip.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "192.168.1.20/24"
+  ns_mac     : "00:15:6d:30:29:6b"
+  bridge_type: "NanoStation M5"
+  status     : "down"
+
+
Index: nodes/HMKerk/wleiden.yaml
===================================================================
--- nodes/HMKerk/wleiden.yaml	(revision 13401)
+++ nodes/HMKerk/wleiden.yaml	(revision 13401)
@@ -0,0 +1,90 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.16834"
+location  : "RK Kerk, Kerkstaat 59, 2355 AH, Hoogmade"
+longitude : "4.58008"
+masterip  : "172.25.64.1"
+monitoring_group: "westeinder"
+nodename  : "HMKerk"
+nodetype  : "Hybrid"
+rdnap_x   : 99782
+rdnap_y   : 464772
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ue0:
+  comment    : "Omni voor de buurt"
+  ip         : "172.25.64.1/24"
+  sdesc      : "2buurt"
+  mode       : "ap"
+  type       : "eth"
+  channel    : "1"
+  ssid       : "WiFi-Hoogmade"
+  dhcp       : "10-60"
+  ns_ip      : "172.25.64.2"
+  ns_mac     : "00:15:6d:e8:e7:46"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+
+
+iface_vr0:
+  comment    : "Link to StBavo2"
+  ip         : "172.16.9.20/29"
+  sdesc      : "2stbavo2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-zo.stbavo2.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.9.19/29"
+  ns_mac     : "00:15:6d:70:51:f1"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link to ZTWRijneke"
+  ip         : "172.16.5.249/29"
+  sdesc      : "2casba"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-zw.hmkerk.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.5.250/29"
+  ns_mac     : "00:15:6d:70:51:f3"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link to Noord"
+  ip         : "172.16.6.57/29"
+  sdesc      : "2noord"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-n.hmkerk.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.6.58/29"
+  ns_mac     : "00:27:22:8a:3b:cf"
+  bridge_type: "NanoStation5M"
+  status     : "up"
+
+
Index: nodes/Haagwijk/wleiden.yaml
===================================================================
--- nodes/Haagwijk/wleiden.yaml	(revision 13401)
+++ nodes/Haagwijk/wleiden.yaml	(revision 13401)
@@ -0,0 +1,103 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.14253"
+location  : "Woon-zorgcentrum Haagwijk, Beethovenlaan 2, 2324 EL, Leiden"
+longitude : "4.47319"
+masterip  : "172.20.144.1"
+monitoring_group: "wleiden"
+nodename  : "Haagwijk"
+nodetype  : "Hybrid"
+rdnap_x   : 92434
+rdnap_y   : 461987
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap"
+  ip         : "172.20.144.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:02:bf:66"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar Rick"
+  ip         : "172.16.4.145/29"
+  sdesc      : "2rick"
+  mode       : "station-wds"
+  type       : "eth"
+  channel    : "40"
+  ssid       : "il-zw.haagwijk.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.4.146/29"
+  ns_mac     : "00:15:6d:ec:82:43"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar ROC"
+  ip         : "172.16.17.129/29"
+  sdesc      : "2rocl"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-o.haagwijk.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.17.130"
+  ns_mac     : "00:15:6d:ec:82:60"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Nanostation5 naar LivingLab"
+  ip         : "172.16.17.116/29"
+  sdesc      : "2livinglab"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-zo.livinglab.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.17.115/29"
+  ns_mac     : "00:15:6d:bd:68:05"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar AJsoft1"
+  ip         : "172.16.5.233/29"
+  sdesc      : "2ajsoft1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "128"
+  ssid       : "il-nw.haagwijk.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.5.234/29"
+  ns_mac     : "00:15:6d:ea:f0:f6"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/Heineken/wleiden.yaml
===================================================================
--- nodes/Heineken/wleiden.yaml	(revision 13401)
+++ nodes/Heineken/wleiden.yaml	(revision 13401)
@@ -0,0 +1,100 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.13810"
+location  : "Heineken Nederland B.V., Burgemeester Smeetsweg 1, 2382PH, Zoeterwoude"
+longitude : "4.54213"
+masterip  : "172.17.78.1"
+monitoring_group: "wleiden"
+nodename  : "Heineken"
+nodetype  : "Hybrid"
+portal_sponsor: "Heineken "
+portal_url: "http://www.heineken.com/nl"
+rdnap_x   : 97147
+rdnap_y   : 461437
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ue0:
+  comment    : "Link naar oost"
+  ip         : "172.16.6.217/29"
+  sdesc      : "2oost"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-o.heineken.wleiden.net"
+  dhcp       : False
+  ns_ip      : "172.16.6.218/29"
+  ns_mac     : "dc:9f:db:2e:ae:63"
+  bridge_type: "NanoBridge M5"
+  status     : "down"
+
+
+iface_vr0:
+  comment    : "Link naar noord"
+  ip         : "172.16.6.172/29"
+  sdesc      : "2noord"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "128"
+  ssid       : "il-160.panterra2.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.6.171/29"
+  ns_mac     : "dc:9f:db:2e:ae:ec"
+  bridge_type: "NanoBridge M5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Meerburgkerk"
+  ip         : "172.16.7.209/29"
+  sdesc      : "2meerburgkerk"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-nw.heineken.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.7.210/29"
+  ns_mac     : "dc:9f:db:2e:b7:fc"
+  bridge_type: "NanoBridge M5"
+  status     : "up"
+
+iface_vr1_alias0:
+  comment    : "Ethernet naar CeTIM1"
+  ip         : "172.16.16.84/29"
+  sdesc      : "2cetim1"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar TUDelft"
+  ip         : "172.16.7.1/29"
+  sdesc      : "2tudelft"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-nno.tudelft.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.7.2/29"
+  ns_mac     : "dc:9f:db:2e:b4:08"
+  bridge_type: "NanoBridge M5"
+  status     : "down"
+
+
Index: nodes/Henk/wleiden.yaml
===================================================================
--- nodes/Henk/wleiden.yaml	(revision 13401)
+++ nodes/Henk/wleiden.yaml	(revision 13401)
@@ -0,0 +1,85 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+gateway   : "192.168.0.225"
+latitude  : "52.17062"
+location  : "Henk, Boddens Hosangweg 24 A, 2481 KZ, Woubrugge"
+longitude : "4.63854"
+masterip  : "172.17.28.1"
+monitoring_group: "wleiden"
+nodename  : "Henk"
+nodetype  : "Hybrid"
+rdnap_x   : 103784
+rdnap_y   : 464983
+rdr_host  : "213.73.188.7"
+rdr_rules :
+- ['tcp', 9080, '172.17.0.41', 80]
+- ['tcp', 9081, '172.17.0.42', 554]
+- ['tcp', 9082, '172.17.0.43', 554]
+- ['tcp', 9083, '172.17.0.44', 80]
+- ['tcp', 9084, '172.17.0.43', 80]
+- ['tcp', 9085, '172.17.0.42', 80]
+- ['tcp', 9086, '172.17.0.45', 21]
+- ['tcp', 9087, '172.17.0.45', 3389]
+- ['tcp', 9092, '172.17.51.5', 80]
+- ['tcp', 9096, '172.17.13.66', 88]
+release   : "9.0-RELEASE"
+remote_access: "213.73.188.7"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: True
+service_proxy_ileiden: True
+service_proxy_normal: True
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Internal Wireless"
+  ip         : "172.17.28.1/26"
+  sdesc      : "binnen"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Woubrugge"
+  wlan_mac   : "00:1b:b1:05:02:e6"
+  dhcp       : "10-60"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link to external interface"
+  ip         : "0.0.0.0/30"
+  sdesc      : "2external"
+  type       : "eth"
+  dhcp       : "client"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar WBRotary"
+  ip         : "172.16.6.76/29"
+  sdesc      : "2wbrotary"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-n.wbrotary.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.6.75/29"
+  ns_mac     : "04:18:D6:CC:00:53"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Lokaal Dev Netwerk"
+  ip         : "172.17.33.1/24"
+  sdesc      : "2dev"
+  type       : "eth"
+  dhcp       : "10-20"
+  status     : "up"
+
+
Index: nodes/Herman/wleiden.yaml
===================================================================
--- nodes/Herman/wleiden.yaml	(revision 13401)
+++ nodes/Herman/wleiden.yaml	(revision 13401)
@@ -0,0 +1,63 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+ileiden   : False
+latitude  : "52.25868"
+location  : "Jasmijnstraat 25 1431 RH Aalsmeer"
+longitude : "4.75797"
+masterip  : "172.17.75.1"
+monitoring_group: "wleiden"
+nodename  : "Herman"
+nodetype  : "Hybrid"
+rdnap_x   : "112039"
+rdnap_y   : "474703"
+rdr_host  : "scholten.mynetgear.com"
+rdr_rules :
+- ['tcp', 3389, '172.17.0.45', 3389]
+- ['tcp', 9080, '172.17.0.41', 80]
+- ['tcp', 9081, '172.17.0.42', 554]
+- ['tcp', 9082, '172.17.0.43', 554]
+- ['tcp', 9083, '172.17.0.44', 80]
+- ['tcp', 9084, '172.17.0.43', 80]
+- ['tcp', 9085, '172.17.0.42', 80]
+- ['tcp', 9086, '172.17.0.45', 21]
+- ['tcp', 9087, '172.17.0.45', 3389]
+- ['tcp', 9092, '172.17.51.5', 80]
+- ['tcp', 9096, '172.17.13.66', 88]
+release   : "9.0-RELEASE"
+service_accesspoint: False
+service_concentrator: False
+service_incoming_rdr: True
+service_proxy_ileiden: True
+service_proxy_normal: False
+status    : "up"
+wl_release: 10805
+
+
+iface_vr0:
+  comment    : "Link naar Router"
+  ip         : "192.168.1.50/24"
+  sdesc      : "uplink"
+  type       : "eth"
+  dhcp       : "client"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Interlink naar de watertoren1"
+  ip         : "172.17.0.36/28"
+  sdesc      : "2watertoren1"
+  mode       : "station-wds"
+  type       : "eth"
+  channel    : "106"
+  ssid       : "il-n.watertoren1.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.17.0.35/28"
+  ns_mac     : "04:18:d6:cc:0b:8c"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
Index: nodes/Hofland/wleiden.yaml
===================================================================
--- nodes/Hofland/wleiden.yaml	(revision 13401)
+++ nodes/Hofland/wleiden.yaml	(revision 13401)
@@ -0,0 +1,65 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "net4801"
+comment   : "None"
+latitude  : "52.140733"
+location  : " , Joke Smitlaan 116, 2253 PD, Voorschoten"
+longitude : "4.458316"
+masterip  : "172.20.148.1"
+monitoring_group: "wleiden"
+nodename  : "Hofland"
+nodetype  : "Hybrid"
+rdnap_x   : 91413 
+rdnap_y   : 461800
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_sis0:
+  comment    : "Ethernet naar Alans internet"
+  ip         : "0.0.0.0/24"
+  sdesc      : "2local"
+  type       : "eth"
+  dhcp       : client
+  status     : "up"
+
+
+iface_sis1:
+  comment    : "Link naar AJSoft2"
+  ip         : "172.16.6.44/29"
+  sdesc      : "2ajsot2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-zw.ajsoft2.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.6.43/29"
+  ns_mac     : "00:15:6d:70:53:4a"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_sis2:
+  comment    : "Omni ap"
+  ip         : "172.20.148.1/24"
+  sdesc      : "2buurt"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "ap-WirelessLeiden-Hofland"
+  dhcp       : "10-250"
+  ns_ip      : "172.20.148.2"
+  ns_mac     : "dc:9f:db:3e:27:a1"
+  bridge_type: "BulletM2"
+  status     : "up"
+
+
Index: nodes/Hofwijck/wleiden.yaml
===================================================================
--- nodes/Hofwijck/wleiden.yaml	(revision 13401)
+++ nodes/Hofwijck/wleiden.yaml	(revision 13401)
@@ -0,0 +1,95 @@
+# 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"
+monitoring_group: "wleiden"
+nodename  : "Hofwijck"
+nodetype  : "Hybrid"
+rdnap_x   : 92795
+rdnap_y   : 466629
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "down"
+
+
+iface_ath0:
+  comment    : "Ap voor de buurt"
+  ip         : "172.23.16.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  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"
+  bridge_type: "Bullet2"
+  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 Lijtweg2"
+  ip         : "172.16.3.108/29"
+  sdesc      : "2lijtweg1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "124"
+  ssid       : "il-ozo.lijtweg2.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/Hortus/wleiden.yaml
===================================================================
--- nodes/Hortus/wleiden.yaml	(revision 13401)
+++ nodes/Hortus/wleiden.yaml	(revision 13401)
@@ -0,0 +1,127 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.15718"
+location  : "Hortus Botanicus Wintertuin, Rapenburg 73, 2311 GJ, Leiden"
+longitude : "4.48483"
+masterip  : "172.17.64.1"
+monitoring_group: "wleiden"
+nodename  : "Hortus"
+nodetype  : "Hybrid"
+portal_sponsor: "Hortus Botanicus"
+portal_url: "http://www.hortusleiden.nl/"
+rdnap_x   : 93251
+rdnap_y   : 463607
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap voor de buurt"
+  ip         : "172.17.64.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Leiden"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar Vosko2"
+  ip         : "172.16.4.140/29"
+  sdesc      : "2vosko"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-w2.vosko2.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.4.139/29"
+  ns_mac     : "00:27:22:8a:3d:28"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Accesspoint wzw "
+  ip         : "172.16.8.1/24"
+  sdesc      : "2apwzw"
+  mode       : "ap-repeater"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "WiFi-Leiden"
+  dhcp       : "10-250"
+  compass    : "wzw"
+  ns_ip      : "172.16.8.2/24"
+  ns_mac     : "DC:9F:DB:62:14:BA"
+  bridge_type: "NanoStationM2"
+  status     : "up"
+
+iface_vr1_extra0:
+  comment    : "Repeater-3 orangerie"
+  ip         : "172.16.8.3/24"
+  mode       : "ap-repeater"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ns_mac     : "dc:9f:db:3e:22:95"
+  bridge_type: "NanoStationM2-loco"
+  status     : "up"
+
+iface_vr1_extra1:
+  comment    : "Repeater-4 tropische kas"
+  ip         : "172.16.8.4/24"
+  mode       : "ap-repeater"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ns_mac     : "DC:9F:DB:3E:27:34"
+  bridge_type: "NanoStationM2-loco"
+  status     : "up"
+
+iface_vr1_extra2:
+  comment    : "Repeater-5 Victoria kas"
+  ip         : "172.16.8.5/24"
+  mode       : "ap-repeater"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ns_mac     : "DC:9F:DB:3E:27:87"
+  bridge_type: "NanoStationM2-loco"
+  status     : "up"
+
+iface_vr1_extra3:
+  comment    : "Repeater-6 Clusius Cafe"
+  ip         : "172.16.8.6/24"
+  mode       : "ap-repeater"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ns_mac     : "DC:9F:DB:3E:22:43"
+  bridge_type: "NanoStationM2-loco"
+  status     : "up"
+
+iface_vr2:
+  comment    : "Interlink naar rijnvliet 172.16.4.161/29 - alleen winterlink"
+  ip         : "0.0.0.0/29"
+  sdesc      : "2rijnvliet"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-no.rv.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.4.162/29"
+  ns_mac     : "00:27:22:10:ec:8d"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
Index: nodes/Houtmarkt/wleiden.yaml
===================================================================
--- nodes/Houtmarkt/wleiden.yaml	(revision 13401)
+++ nodes/Houtmarkt/wleiden.yaml	(revision 13401)
@@ -0,0 +1,85 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.16353"
+location  : "Speciale Basisschool Vuurvogel, Houtmarkt 36, 2312 PZ, Leiden"
+longitude : "4.49858"
+masterip  : "172.19.8.1"
+monitoring_group: "wleiden"
+nodename  : "Houtmarkt"
+nodetype  : "Hybrid"
+rdnap_x   : 94200
+rdnap_y   : 464302
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Omni voor de buurt"
+  ip         : "172.19.8.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Leiden"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar Som1"
+  ip         : "172.16.17.220/29"
+  sdesc      : "2som1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-z.som1.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.17.219/29"
+  ns_mac     : "00:15:6d:70:54:9d"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Naar Cetim1 richting ZW"
+  ip         : "172.16.17.148/29"
+  sdesc      : "2cetim1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "120"
+  ssid       : "il-no.cetim1.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.17.147"
+  ns_mac     : "00:15:6d:70:52:65"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Extra AP"
+  ip         : "172.17.43.1/24"
+  sdesc      : "ap2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "8"
+  ssid       : "ap-WirelessLeiden-Houtmarkt2"
+  dhcp       : "10-250"
+  ns_ip      : "172.17.43.2"
+  ns_mac     : "00:15:6d:30:28:4e"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+
Index: nodes/Huub/wleiden.yaml
===================================================================
--- nodes/Huub/wleiden.yaml	(revision 13401)
+++ nodes/Huub/wleiden.yaml	(revision 13401)
@@ -0,0 +1,129 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "net6501"
+comment   : "None"
+externalif: "vr0"
+latitude  : "52.15685"
+location  : "Huub, Rapenburg 62, 2311 EZ, Leiden"
+longitude : "4.48626"
+masterip  : "172.17.16.1"
+monitoring_group: "wleiden"
+nodename  : "Huub"
+nodetype  : "Hybrid"
+rdnap_x   : "093348"
+rdnap_y   : 463569
+release   : "9.0-RELEASE"
+remote_access: "huubs.xs4all.nl:1022"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap"
+  ip         : "172.17.16.1/26"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "30:14:4a:86:bb:b0"
+  dhcp       : "10-60"
+  status     : "up"
+
+
+iface_sis0:
+  comment    : "Local ethernet naar extra ap2"
+  ip         : "172.17.16.129/26"
+  sdesc      : "2ap2"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "ap-WirelessLeiden-Huub2"
+  dhcp       : "140-180"
+  ns_ip      : "172.17.16.130/26"
+  ns_mac     : "00:15:6d:d4:f8:24"
+  bridge_type: "Bullet2"
+  status     : "down"
+
+
+iface_sis1:
+  comment    : "Local ethernet naar extra ap3"
+  ip         : "172.17.65.1/24"
+  sdesc      : "2ap3"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "WiFi Leiden"
+  dhcp       : "10-250"
+  ns_ip      : "172.17.65.2/24"
+  ns_mac     : "00:15:6d:e8:f9:c0"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "External Link"
+  ip         : "192.168.3.32/24"
+  sdesc      : "2external"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Vosko2"
+  ip         : "172.16.4.124/29"
+  sdesc      : "2vosko2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "64"
+  ssid       : "il-w.vosko2.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.4.123/29"
+  ns_mac     : "00:15:6d:d6:33:35"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Cetim2"
+  ip         : "172.16.4.28/29"
+  sdesc      : "2cetim2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-zw.cetim2.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.4.27/29"
+  ns_mac     : "00:15:6d:f2:1f:7f"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr3:
+  comment    : "External Link"
+  ip         : "172.16.3.85/30"
+  sdesc      : "2external"
+  type       : "eth"
+  dhcp       : False
+  status     : "down"
+
+
+iface_vr3_alias0:
+  comment    : "Link naar sunnysidekick"
+  ip         : "172.16.3.21/30"
+  sdesc      : "2sunnysidekick"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
Index: nodes/IMI/wleiden.yaml
===================================================================
--- nodes/IMI/wleiden.yaml	(revision 13401)
+++ nodes/IMI/wleiden.yaml	(revision 13401)
@@ -0,0 +1,114 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.15454"
+location  : "Regionaal Archief Leiden, Boisotkade 2A, 2311 PZ,, Leiden"
+longitude : "4.48724"
+masterip  : "172.17.24.1"
+monitoring_group: "wleiden"
+nodename  : "IMI"
+nodetype  : "Hybrid"
+rdnap_x   : 93412
+rdnap_y   : 463311
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor de buurt"
+  ip         : "172.17.24.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:02:bf:50"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar Thomas"
+  ip         : "172.16.16.52/29"
+  sdesc      : "2thomas"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "7"
+  ssid       : "il-zw.thomas.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.16.51/29"
+  ns_mac     : "00:15:6d:70:54:a5"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar RijnVliet"
+  ip         : "172.16.5.244/29"
+  sdesc      : "2rijnvliet"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "60"
+  ssid       : "il-no.rv.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.5.243/29"
+  ns_mac     : "00:15:6d:ec:81:ee"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar CeTIM2"
+  ip         : "172.16.16.252/29"
+  sdesc      : "2cetim2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-zw.cetim2.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.16.251/29"
+  ns_mac     : "00:15:6d:ec:81:ef"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Extra ap, met wds-peer bij Babbels"
+  ip         : "172.17.42.1/24"
+  sdesc      : "ap2"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "4"
+  ssid       : "WiFi-Leiden"
+  dhcp       : "10-250"
+  compass    : "w"
+  ns_ip      : "172.17.42.2/24"
+  ns_mac     : "00:15:6d:e8:f9:de"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+iface_vr2_extra0:
+  comment    : "ap bij Babbels"
+  ip         : "172.17.42.3/24"
+  mode       : "repeater"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ns_mac     : "00:15:6d:e8:e6:b1"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+
Index: nodes/JAR/wleiden.yaml
===================================================================
--- nodes/JAR/wleiden.yaml	(revision 13401)
+++ nodes/JAR/wleiden.yaml	(revision 13401)
@@ -0,0 +1,81 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.11745"
+location  : "Zwembad Haasbroek, Nieuweweg 4, 2381 NW,Zoeterwoude "
+longitude : "4.50214"
+masterip  : "172.17.56.1"
+monitoring_group: "wzoeterwoude"
+nodename  : "JAR"
+nodetype  : "Hybrid"
+rdnap_x   : 94381
+rdnap_y   : 459173
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Omni voor rustplaats"
+  ip         : "172.17.56.1/24"
+  sdesc      : "2buurt"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "ap-ZTW-JAR-Plein"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Nanostation gericht op het veld"
+  ip         : "172.17.57.1/24"
+  sdesc      : "2noord"
+  mode       : "ap-wds"
+  type       : "eth"
+  ssid       : "ap-ZTW-JAR-Veld"
+  dhcp       : "10-250"
+  ns_ip      : "172.17.57.2/24"
+  ns_mac     : "00:27:22:e2:53:e3"
+  bridge_type: "NanoStation M2"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Zwet"
+  ip         : "172.16.4.52/29"
+  sdesc      : "2zwet"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-z.zwet.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.4.51/29"
+  ns_mac     : "00:27:22:10:f5:b9"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar ROC2"
+  ip         : "172.16.5.52/29"
+  sdesc      : "2roc2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-z.roc2.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.5.51/29"
+  ns_mac     : "00:27:22:8a:3b:c6"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
Index: nodes/JVC/wleiden.yaml
===================================================================
--- nodes/JVC/wleiden.yaml	(revision 13401)
+++ nodes/JVC/wleiden.yaml	(revision 13401)
@@ -0,0 +1,111 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.14243"
+location  : "JVC, De Heyderweg 1, 2314 XZ, Leiden"
+longitude : "4.50905"
+masterip  : "172.18.32.1"
+monitoring_group: "wleiden"
+nodename  : "JVC"
+nodetype  : "Hybrid"
+rdnap_x   : 94888
+rdnap_y   : 461946
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor de buurt"
+  ip         : "172.18.32.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:02:bf:4e"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar Zoeterwoude Dorp"
+  ip         : "172.16.5.153/29"
+  sdesc      : "2ZTW"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-z.jvc.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.5.154/29"
+  ns_mac     : "00:27:22:8a:3b:fc"
+  bridge_type: "NanoStation M5"
+  status     : "down"
+
+
+iface_vr0:
+  comment    : "Link naar ROC2"
+  ip         : "172.16.5.33/29"
+  sdesc      : "2ROC2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-w.jvc.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.5.34/29"
+  ns_mac     : "00:15:6d:ea:eb:d3"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr0_alias0:
+  comment    : "Link naar Camera op ROC Oost"
+  ip         : "172.16.3.141/30"
+  type       : "eth"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "A-link to Graficall via Nanostation5"
+  ip         : "172.16.3.9/29"
+  sdesc      : "2graficall"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-no.jvc.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.3.10/29"
+  ns_mac     : "00:15:6d:ea:f0:fe"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Meerburg"
+  ip         : "172.16.4.241/29"
+  sdesc      : "2meerburg"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "60"
+  ssid       : "il-o.jvc.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.4.242/29"
+  ns_mac     : "00:15:6d:ea:f0:67"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/JorisdeWitte/wleiden.yaml
===================================================================
--- nodes/JorisdeWitte/wleiden.yaml	(revision 13401)
+++ nodes/JorisdeWitte/wleiden.yaml	(revision 13401)
@@ -0,0 +1,88 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+gateway   : "213.124.17.161"
+latitude  : "52.194433"
+location  : "Chr. Basisschool Joris de Witte, Jan Wolkerslaan 18, 2343BK, Oegstgeest"
+longitude : "4.478018"
+masterip  : "172.17.39.1"
+monitoring_group: "Oegstgeest"
+nodename  : "JorisdeWitte"
+nodetype  : "Hybrid"
+rdnap_x   : 928360
+rdnap_y   : 467757
+rdr_host  : "213.124.17.164"
+rdr_rules :
+- ['tcp', 9080, '172.17.0.41', 80]
+- ['tcp', 9081, '172.17.0.42', 554]
+- ['tcp', 9082, '172.17.0.43', 554]
+- ['tcp', 9083, '172.17.0.44', 80]
+- ['tcp', 9084, '172.17.0.43', 80]
+- ['tcp', 9085, '172.17.0.42', 80]
+- ['tcp', 9086, '172.17.0.45', 21]
+- ['tcp', 9087, '172.17.0.45', 3389]
+- ['tcp', 9091, '172.16.9.237', 88]
+- ['tcp', 9092, '172.17.51.5', 80]
+- ['tcp', 9096, '172.17.13.66', 88]
+- ['tcp', 9099, '172.16.9.116', 80]
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: True
+service_proxy_normal: True
+status    : "up"
+
+iface_ath0:
+  comment    : "Omni voor de buurt"
+  ip         : "172.17.39.1/24"
+  sdesc      : "omni"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Oegstgeest-JorisdeWitte"
+  wlan_mac   : "00:1b:b1:00:eb:ba"
+  dhcp       : "10-250"
+  status     : "up"
+
+iface_vr0:
+  comment    : "Ethernet naar JorisdeWitte"
+  ip         : "213.124.17.163/29"
+  sdesc      : "2joris"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr1:
+  comment    : "Interlink naar Som1"
+  ip         : "172.16.7.12/29"
+  sdesc      : "2som1"
+  mode       : "station"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-nnw.som1.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.7.11"
+  ns_mac     : "dc:9f:db:f2:0e:5d"
+  bridge_type: "NanoBridge25 M5"
+  status     : "up"
+
+iface_vr2:
+  comment    : "Interlink naar AkzoNobel2"
+  ip         : "172.16.7.17/29"
+  sdesc      : "2akzonobel2"
+  mode       : "station"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "64"
+  ssid       : "il-nno.jorisdewitte.wleiden.net"
+  dhcp       : False
+  compass    : "nno"
+  ns_ip      : "172.16.7.18"
+  ns_mac     : "00:15:6d:f2:43:83"
+  bridge_type: "NanoStation M5"
+  status     : "up"
Index: nodes/Juffermans/wleiden.yaml
===================================================================
--- nodes/Juffermans/wleiden.yaml	(revision 13401)
+++ nodes/Juffermans/wleiden.yaml	(revision 13401)
@@ -0,0 +1,135 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+height    : "17"
+latitude  : "52.18838"
+location  : "Jachtwerf Juffermans, Veerpolder 69, 2361 KZ, Warmond"
+longitude : "4.50260"
+masterip  : "172.17.53.1"
+monitoring_group: "wleiden"
+nodename  : "Juffermans"
+nodetype  : "Hybrid"
+portal_sponsor: "Jachtwerf Juffermans"
+portal_url: "http://www.jachthavenjuffermans.nl/"
+rdnap_x   : "094509"
+rdnap_y   : 467063
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Access Point jachtwerf"
+  ip         : "172.17.55.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "ap-WL-JachtwerfJuffermans"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Access Point jachthaven"
+  ip         : "172.17.53.1/24"
+  sdesc      : "apzo"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "11"
+  ssid       : "ap-WL-JachthvnJuffermans-o"
+  dhcp       : "10-250"
+  compass    : "zo"
+  ns_ip      : "172.17.53.2/24"
+  ns_mac     : "00:27:22:e2:50:b5"
+  bridge_type: "NanoStation M2"
+  status     : "up"
+
+
+iface_ue1:
+  comment    : "Access Point nw"
+  ip         : "172.17.54.1/24"
+  sdesc      : "apnw"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "2"
+  ssid       : "ap-WL-JachthvnJuffermans-w"
+  dhcp       : "10-250"
+  compass    : "nw"
+  ns_ip      : "172.17.54.2/24"
+  ns_mac     : "00:27:22:e2:53:27"
+  bridge_type: "NanoStation M2"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "APs 5GHz op voormalige IL-Nano's via switch"
+  ip         : "172.17.148.1/24"
+  sdesc      : "apsa"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "60"
+  ssid       : "ap-WL-JachthvnJuffermans-a"
+  dhcp       : "10-250"
+  compass    : "no"
+  ns_ip      : "172.17.148.2/24"
+  ns_mac     : "00:27:22:10:fd:8e"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr0_extra0:
+  comment    : "APs 5GHz op voormalige IL-Nano's via switch"
+  channel    : "36"
+  ssid       : "ap-WL-JachthvnJuffermans-a"
+  compass    : "o"
+  type       : "eth"
+  ip         : "172.17.148.3/24"
+  ns_mac     : "00:27:22:8a:3d:2c"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Lijtweg2"
+  ip         : "172.16.3.148/29"
+  sdesc      : "2lijtweg2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "161"
+  ssid       : "il-ono.lijtweg2.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.3.147/29"
+  ns_mac     : "00:27:22:8a:3b:c4"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar SOM1"
+  ip         : "172.16.3.164/29"
+  sdesc      : "2som1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-n.som1.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.3.163/29"
+  ns_mac     : "00:27:22:8a:3b:b6"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
Index: nodes/KWAster/wleiden.yaml
===================================================================
--- nodes/KWAster/wleiden.yaml	(revision 13401)
+++ nodes/KWAster/wleiden.yaml	(revision 13401)
@@ -0,0 +1,101 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+height    : "16"
+latitude  : "52.18667"
+location  : "flat, Asterstraat 254, 2223 VN, Katwijk"
+longitude : "4.41978"
+masterip  : "172.23.26.1"
+monitoring_group: "Katwijk"
+nodename  : "KWAster"
+nodetype  : "Hybrid"
+rdnap_x   : 88843
+rdnap_y   : 466945
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Omni voor de buurt"
+  ip         : "172.23.26.1/24"
+  sdesc      : "omni"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Katwijk"
+  wlan_mac   : "00:1b:b1:05:02:bd"
+  dhcp       : "10-250"
+  status     : "up"
+
+iface_ue0:
+  comment    : "noord 356gr. 2135m"
+  ip         : "172.16.10.113/29"
+  sdesc      : "2noord"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-n.aster.wleiden.net"
+  channel    : 124
+  dhcp       : False
+  compass    : "356"
+  ns_ip      : "172.16.10.114/29"
+  ns_mac     : "04:18:d6:54:cc:fd"
+  bridge_type: "NanoBeamM5"
+  status     : "down"
+
+iface_vr0:
+  comment    : "unused"
+  ip         : "172.16.3.33/29"
+  sdesc      : "2unused"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-nw.aster.wleiden.net"
+  channel    : 132
+  dhcp       : False
+  compass    : "309"
+  ns_ip      : "172.16.3.34/29"
+  ns_mac     : ""
+  bridge_type: "NanoBeamM5"
+  status     : "down"
+
+iface_vr1:
+  comment    : "naar lijtweg1, il-west "
+  ip         : "172.16.17.92/29"
+  sdesc      : "aster2lijtweg1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-w.lijtweg1.wleiden.net"
+  channel    : 116
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.17.91/29"
+  ns_mac     : "00:15:6d:ec:82:8a"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+iface_vr2:
+  comment    : "naar UniGorN"
+  ip         : "172.16.17.100/29"
+  sdesc      : "aster2unigorn"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-o.unigorn.wleiden.net"
+  channel    : 104
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.17.99/29"
+  ns_mac     : "00:15:6d:70:53:40"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/KWVdeKaag/ProxyKWVdeKaag/wleiden.yaml
===================================================================
--- nodes/KWVdeKaag/ProxyKWVdeKaag/wleiden.yaml	(revision 13401)
+++ nodes/KWVdeKaag/ProxyKWVdeKaag/wleiden.yaml	(revision 13401)
@@ -0,0 +1,42 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "net45xx"
+comment   : "None"
+externalif: "sis0"
+gateway   : "192.168.178.1"
+ileiden   : False
+internalif: "sis1"
+internalroute: "172.16.18.17"
+latitude  : "52.19745"
+location  : "Societeit KWV de Kaag, Sweilandpolder 8, 2362AG Warmond"
+longitude : "4.53709"
+masterip  : "172.16.18.18"
+monitoring_group: "wleiden"
+nodename  : "KWVdeKaag"
+nodetype  : "Proxy"
+proxyid   : 16
+rdnap_x   : 96879
+rdnap_y   : 468044
+release   : "8.2-RELEASE"
+status    : "up"
+
+
+iface_sis0:
+  comment    : "Link naar Router"
+  ip         : "0.0.0.0/30"
+  sdesc      : "uplink"
+  type       : "eth"
+  dhcp       : "client"
+  status     : "up"
+
+
+iface_sis1:
+  comment    : "Link naar NodeKWVdeKaag"
+  ip         : "172.16.18.18/30"
+  sdesc      : "downlink"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
Index: nodes/KWVdeKaag/wleiden.yaml
===================================================================
--- nodes/KWVdeKaag/wleiden.yaml	(revision 13401)
+++ nodes/KWVdeKaag/wleiden.yaml	(revision 13401)
@@ -0,0 +1,156 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+ileiden   : True
+latitude  : "52.19745"
+location  : "Starttoren KWV de Kaag, Sweilandpolder 8, 2362AG Warmond"
+longitude : "4.53709"
+masterip  : "172.27.16.1"
+monitoring_group: "wleiden"
+nodename  : "KWVdeKaag"
+nodetype  : "Hybrid"
+rdnap_x   : 96879
+rdnap_y   : 468044
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Omni voor de buurt"
+  ip         : "172.27.16.1/24"
+  sdesc      : "omni"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "ap-WirelessLeiden-Kwv"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar zuid"
+  ip         : "172.16.18.9/29"
+  sdesc      : "2zuid"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "136"
+  ssid       : "il-z.kwvdekaag.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.18.10/29"
+  ns_mac     : "00:15:6d:e2:be:15"
+  bridge_type: "NanoStation M5"
+  status     : "down"
+
+
+iface_vr0:
+  comment    : "Link naar StBavo1"
+  ip         : "172.16.7.244/29"
+  sdesc      : "2stbavo"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-w.stbavo1.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.7.243/29"
+  ns_mac     : "dc:9f:db:2e:b3:2a"
+  bridge_type: "NanoBridgeM24"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Lijtweg2 via nodekast-switch"
+  ip         : "172.16.17.252/29"
+  sdesc      : "2lijtweg2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-ozo.lijtweg2.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.17.251/29"
+  ns_mac     : "00:15:6d:f2:44:2e"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1_alias0:
+  comment    : "Link naar Kaag1 via nodekast-switch"
+  ip         : "172.16.18.4/29"
+  sdesc      : "2kaag1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "128"
+  ssid       : "il-z.kaag1.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.18.3/29"
+  ns_mac     : "00:15:6d:e2:be:7c"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1_alias1:
+  comment    : "Link naar McDonalds via nodekast-switch"
+  ip         : "172.16.4.17/29"
+  sdesc      : "2mcdonalds"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-w.kwvdekaag.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.4.18/29"
+  ns_mac     : "dc:9f:db:64:2d:61"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar proxykwvdekaag via tweede switch"
+  ip         : "172.16.18.17/30"
+  sdesc      : "2proxykwvdekaag"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr2_alias0:
+  comment    : "Lokaal subnet voor ap-s via tweede switch"
+  ip         : "172.17.23.1/24"
+  sdesc      : "2aps"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : "10-250"
+  channel    : "6"
+  ssid       : "ap-WAL"
+  compass    : "zw"
+  ns_ip      : "172.17.23.2/24"
+  ns_mac     : "00:15:6D:30:D2:CF"
+  bridge_type: "Nanostation2"
+  status     : "up"
+
+iface_vr2_extra0:
+  comment    : "AP repeater kabel 6"
+  channel    : "6"
+  ssid       : "ap-HAVEN"
+  compass    : "z"
+  type       : "eth"
+  ip         : "172.17.23.4/24"
+  ns_mac     : "00:15:6D:30:D2:B5"
+  bridge_type: "Nanostation2"
+  status     : "up"
+
Index: nodes/Kaag1/wleiden.yaml
===================================================================
--- nodes/Kaag1/wleiden.yaml	(revision 13401)
+++ nodes/Kaag1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,89 @@
+# 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"
+monitoring_group: "wleiden"
+nodename  : "Kaag1"
+nodetype  : "Hybrid"
+portal_sponsor: "Stichting Promotie Kaag"
+portal_url: "http://www.kaag.nl/"
+rdnap_x   : 98187
+rdnap_y   : 469717
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+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       : "11g"
+  channel    : 11
+  ssid       : "WiFi-SPKaag"
+  wlan_mac   : "00:1b:b1:f1:74:58"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar TEYAkzoNobel1"
+  ip         : "172.16.9.252/29"
+  sdesc      : "2lijtweg1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "112"
+  ssid       : "il-no.teyakzonobel1.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.9.251/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/Kaag2/wleiden.yaml
===================================================================
--- nodes/Kaag2/wleiden.yaml	(revision 13401)
+++ nodes/Kaag2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,116 @@
+# 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"
+monitoring_group: "wleiden"
+nodename  : "Kaag2"
+nodetype  : "Hybrid"
+portal_sponsor: "Stichting Promotie Kaag"
+portal_url: "http://www.kaag.nl/"
+rdnap_x   : 98420
+rdnap_y   : 470298
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP richting Dieperpoel via kaartje op gaasantennes"
+  ip         : "172.27.8.1/24"
+  sdesc      : "omni"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-SPKaag"
+  wlan_mac   : "00:1b:b1:f1:74:77"
+  dhcp       : "10-250"
+  compass    : "zw"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "AP richting brug A44 op NanoStation M2"
+  ip         : "172.17.81.1/24"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "11"
+  ssid       : "WiFi SPKaag"
+  dhcp       : "10-250"
+  compass    : "nw"
+  ns_ip      : "172.17.81.2/24"
+  ns_mac     : "00:27:22:e2:52:39"
+  bridge_type: "NanoStationM2"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar Watertoren2"
+  ip         : "172.16.9.172/29"
+  sdesc      : "2watertoren2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "64"
+  ssid       : "il-zw.watertoren2.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.9.171/29"
+  ns_mac     : "dc:9f:db:2e:b9:df"
+  bridge_type: "NanoBridgeM5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Kaag1"
+  ip         : "172.16.17.65/29"
+  sdesc      : "2kaag1"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "112"
+  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 StBavo1"
+  ip         : "172.16.7.252/29"
+  sdesc      : "2kaag2"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar UniGorN"
+  ip         : "172.16.17.76/29"
+  sdesc      : "2unigorn"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-no.unigorn.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.17.75/29"
+  ns_mac     : "dc:9f:db:f2:11:37"
+  bridge_type: "NanoBridgeM5"
+  status     : "up"
+
+
Index: nodes/Kempers/wleiden.yaml
===================================================================
--- nodes/Kempers/wleiden.yaml	(revision 13401)
+++ nodes/Kempers/wleiden.yaml	(revision 13401)
@@ -0,0 +1,85 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.22644"
+location  : "Jachthaven Kempers, Herenweg 100, 1431GX, Leimuiden"
+longitude : "4.68455"
+masterip  : "172.17.74.1"
+monitoring_group: "wleiden"
+nodename  : "Kempers"
+nodetype  : "Hybrid"
+rdnap_x   : 106992
+rdnap_y   : 471162
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap voor Wifi op de Westeinder"
+  ip         : "172.17.74.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "ap-westeinder-kempers"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar Kudelstaart"
+  ip         : "172.16.16.137/29"
+  sdesc      : "2kudelstaart"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-no.kempers.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.16.138/29"
+  ns_mac     : "00:15:6d:70:54:9e"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Watertoren3"
+  ip         : "172.16.16.233/29"
+  sdesc      : "2watertoren3"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-zw.watertoren3.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.16.234/29"
+  ns_mac     : "00:15:6d:70:53:3e"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Ethernet naar tbd2"
+  ip         : "172.16.16.241/29"
+  sdesc      : "2tbd2"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-n.kempers.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.16.242/29"
+  ns_mac     : "00:15:6d:70:54:56"
+  bridge_type: "NanoStation5"
+  status     : "down"
+
+
Index: nodes/Kijkduin/wleiden.yaml
===================================================================
--- nodes/Kijkduin/wleiden.yaml	(revision 13401)
+++ nodes/Kijkduin/wleiden.yaml	(revision 13401)
@@ -0,0 +1,64 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.262"
+location  : "Kijkduin, Duinweg 78-08, 2204 AV, Noordwijk"
+longitude : "4.462"
+masterip  : "172.17.138.1"
+monitoring_group: "noordwijkerhout"
+nodename  : "Kijkduin"
+nodetype  : "Hybrid"
+portal_sponsor: "Roy"
+portal_url: "rvanswol.nl"
+rdnap_x   : 91819
+rdnap_y   : 475163
+release   : "10.2-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: True
+service_proxy_normal: True
+status    : "up"
+
+iface_vr0:
+  comment    : "Link naar Leeuwenhorst il-350.leeuwenhorst1.wleiden.net"
+  ip         : "172.16.9.148/29"
+  sdesc      : "ilzw"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "120"
+  ssid       : "il-350.leeuwenhorst1.wleiden.net"
+  dhcp       : False
+  compass    : "170"
+  ns_ip      : "172.16.9.147/29"
+  ns_mac     : "DC:9F:DB:64:2D:62"
+  bridge_type: "NanoBeam M5 19"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Accesspoint sector met bullet2"
+  ip         : "172.17.138.1/24"
+  sdesc      : "2nw"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "ap-kijkduin-wleiden.net"
+  compass    : "zo"
+  dhcp       : "20-60"
+  ns_ip      : "172.17.138.10/24"
+  ns_mac     : "00:15:6d:d4:fb:c2"
+  bridge_type: "BulletM2"
+  status     : "down"
+
+iface_vr2:
+  comment    : "Lokaal Dev Netwerk"
+  ip         : "172.17.147.1/24"
+  sdesc      : "2dev"
+  type       : "eth"
+  dhcp       : "10-20"
+  status     : "up"
Index: nodes/Kudelstaart/wleiden.yaml
===================================================================
--- nodes/Kudelstaart/wleiden.yaml	(revision 13401)
+++ nodes/Kudelstaart/wleiden.yaml	(revision 13401)
@@ -0,0 +1,137 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+externalif: "ue1"
+latitude  : "52.23663"
+location  : "Jachthaven Van Wijk Maritiem, Kudelstaartseweg 226, 1433 GR, Kudelstaart"
+longitude : "4.74856"
+masterip  : "172.17.77.1"
+monitoring_group: "westeinder"
+nodename  : "Kudelstaart"
+nodetype  : "Hybrid"
+portal_sponsor: "Van Wijk Maritiem B.V., Kudelstaart"
+portal_url: "http://www.vanwijkmaritiem.nl"
+rdnap_x   : 111375
+rdnap_y   : 472255
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ue0:
+  comment    : "Link naar external interface gateway via NS5 192.168.1.21 00:15:6D:F2:39:37 kabel 5, PoE 4"
+  ip         : "192.168.1.19/24"
+  sdesc      : "2external"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "120"
+  ssid       : "il-z.kudelstaart.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "192.168.1.20/24"
+  ns_mac     : "00:15:6d:ec:82:4c"
+  bridge_type: "NanoStation5"
+  status     : "down"
+
+
+iface_vr0:
+  comment    : "Accesspoint, kabel 4, PoE 2"
+  ip         : "172.17.79.1/24"
+  sdesc      : "2aps"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "ap-Westeinder-Kudelstaart2"
+  dhcp       : "10-250"
+  compass    : "z"
+  ns_ip      : "172.17.79.2/24"
+  ns_mac     : "00:27:22:e2:50:eb"
+  bridge_type: "NanoStation M2"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Kempers Leimuiden via switch, kabel 1, PoE 5"
+  ip         : "172.16.16.140/29"
+  sdesc      : "2kempers"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-no.kempers.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.16.139/29"
+  ns_mac     : "dc:9f:db:2e:0e:95"
+  bridge_type: "NanoBridge M5"
+  status     : "up"
+
+
+iface_vr1_alias0:
+  comment    : "Link naar Watertoren3 via switch, kabel 3, PoE 6"
+  ip         : "172.16.16.148/29"
+  sdesc      : "2wtoren3"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-z.watertoren3.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.16.147/29"
+  ns_mac     : "dc:9f:db:2a:28:d4"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Accesspoints, PoE 3"
+  ip         : "172.17.77.1/24"
+  sdesc      : "2aps"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "ap-Westeinder-Kudelstaart1"
+  dhcp       : "10-250"
+  compass    : "z"
+  ns_ip      : "172.17.77.2/24"
+  ns_mac     : "00:27:22:e2:52:70"
+  bridge_type: "NanoStation M2"
+  status     : "up"
+
+iface_vr2_extra0:
+  comment    : "AP repeater kabel 6"
+  channel    : "6"
+  ssid       : "ap-Westeinder-Kudelstaart1"
+  compass    : "z"
+  type       : "eth"
+  ip         : "172.17.77.3/24"
+  ns_mac     : "00:27:22:66:6B:E0"
+  bridge_type: "BulletM2"
+  status     : "up"
+
+iface_ue1:
+  comment    : "Link naar Enzo Burgerveen, kabel 2, PoE 1"
+  ip         : "172.16.6.209/29"
+  sdesc      : "2enzo"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-w.kudelstaart.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.6.210/29"
+  ns_mac     : "dc:9f:db:2e:0d:57"
+  bridge_type: "NanoBridge M5"
+  status     : "down"
+
Index: nodes/LHS/wleiden.yaml
===================================================================
--- nodes/LHS/wleiden.yaml	(revision 13401)
+++ nodes/LHS/wleiden.yaml	(revision 13401)
@@ -0,0 +1,79 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.17305"
+location  : "De Leidse Houtschool, Adriaan Pauwstraat 1, 2334 CG, Leiden"
+longitude : "4.47694"
+masterip  : "172.17.21.1"
+monitoring_group: "wleiden"
+nodename  : "LHS"
+nodetype  : "Hybrid"
+rdnap_x   : 92733
+rdnap_y   : 465380
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap"
+  ip         : "172.17.21.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "90:a4:de:8b:e3:2c"
+  dhcp       : "10-110"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "External Link"
+  ip         : "0.0.0.0/30"
+  sdesc      : "2external"
+  type       : "eth"
+  dhcp       : "client"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Psycho"
+  ip         : "172.16.3.52/29"
+  sdesc      : "2psycho"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-n.psycho.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.3.51/29"
+  ns_mac     : "00:27:22:10:fd:8a"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Lijtweg2"
+  ip         : "172.16.3.116/29"
+  sdesc      : "2lijtweg2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-z.lijtweg2.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.3.115/29"
+  ns_mac     : "00:27:22:8a:3a:03"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
Index: nodes/Langevoort/wleiden.yaml
===================================================================
--- nodes/Langevoort/wleiden.yaml	(revision 13401)
+++ nodes/Langevoort/wleiden.yaml	(revision 13401)
@@ -0,0 +1,97 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+gateway   : "192.168.1.69"
+ileiden   : True
+latitude  : "52.18620"
+location  : "Hazenboslaan 39, 2343 SW, tegenover school met vleugel dak, Oegstgeest"
+longitude : "4.47699"
+masterip  : "172.23.25.1"
+monitoring_group: "Oegstgeest"
+nodename  : "Langevoort"
+nodetype  : "Hybrid"
+rdnap_x   : 92755
+rdnap_y   : 466842
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: True
+service_proxy_normal: True
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Omni voor de buurt"
+  ip         : "172.23.25.1/24"
+  sdesc      : "omni"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Oegstgeest"
+  wlan_mac   : "00:1b:b1:05:02:df"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Extra AP2"
+  ip         : "172.17.41.1/24"
+  sdesc      : "ap2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "11"
+  ssid       : "WiFi-Oegstgeest-2"
+  dhcp       : "10-240"
+  ns_ip      : "172.17.41.2/24"
+  ns_mac     : "00:15:6d:d4:f8:36"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "External Link"
+  ip         : "192.168.1.70/24"
+  sdesc      : "2external"
+  type       : "eth"
+  dhcp       : "client"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "A-Link naar Lijtweg1"
+  ip         : "172.16.6.244/29"
+  sdesc      : "2lijtweg1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-n.lijtweg1.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.6.243/29"
+  ns_mac     : "dc:9f:db:2a:28:b6"
+  bridge_type: "NanostationM5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Extra AP3"
+  ip         : "172.17.70.1/24"
+  sdesc      : "ap3"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "WiFi-Oegstgeest-3"
+  dhcp       : "10-240"
+  compass    : "w"
+  ns_ip      : "172.17.70.2/29"
+  ns_mac     : "00:15:6d:e9:f9:bd"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+
Index: nodes/Lebkov/wleiden.yaml
===================================================================
--- nodes/Lebkov/wleiden.yaml	(revision 13401)
+++ nodes/Lebkov/wleiden.yaml	(revision 13401)
@@ -0,0 +1,79 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.16678"
+location  : "Lebkov & Sons, Bargelaan 8, 2333 CT, Leiden CS"
+longitude : "4.48182"
+masterip  : "172.19.152.1"
+monitoring_group: "wleiden"
+nodename  : "Lebkov"
+nodetype  : "Hybrid"
+rdnap_x   : 93058
+rdnap_y   : 464678
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap"
+  ip         : "172.19.152.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:ef:ad:ab"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet naar binnen bij Lebkov"
+  ip         : "172.16.5.161/29"
+  sdesc      : "2localAP"
+  type       : "eth"
+  dhcp       : False
+  status     : "down"
+
+
+iface_vr1:
+  comment    : "Link naar Geluidsnet1"
+  ip         : "172.16.17.228/29"
+  sdesc      : "2geluidsnet1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-n.geluidsnet1.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.17.227"
+  ns_mac     : "00:15:6d:70:54:ba"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Lijtweg2"
+  ip         : "172.16.3.132/29"
+  sdesc      : "2lijtweg2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "136"
+  ssid       : "il-z.lijtweg2.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.3.131/29"
+  ns_mac     : "00:15:6d:70:54:51"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/Leeuwenhorst1/wleiden.yaml
===================================================================
--- nodes/Leeuwenhorst1/wleiden.yaml	(revision 13401)
+++ nodes/Leeuwenhorst1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,126 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+gateway   : "192.168.178.1"
+latitude  : "52.25110"
+location  : "Leeuwenhorst, Langelaan 3, 2211 XT, Noordwijkerhout"
+longitude : "4.47198"
+masterip  : "172.16.9.121"
+monitoring_group: "noordwijkerhout"
+nodename  : "Leeuwenhorst1"
+nodetype  : "Hybrid"
+portal_sponsor: "Kop en Schotels"
+portal_url: "http://www.kopenschotels.com/nl/home.html"
+rdnap_x   : 92503
+rdnap_y   : 474067
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: True
+service_proxy_normal: True
+status    : "up"
+externalif : "vr1"
+
+iface_ath0:
+  comment    : "Ap voor beheer, binnen 5 GHz"
+  ip         : "172.16.9.121/29"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11a"
+  channel    : 64
+  ssid       : "WiFi-binnen-a"
+  wlan_mac   : "a8:54:b2:72:c7:ca"
+  dhcp       : "122-126"
+  status     : "up"
+
+iface_ue0:
+  comment    : "Link naar zuidoost kabel 1 UNUSED"
+  ip         : "172.16.6.196/29"
+  sdesc      : "2unused"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-zo.leeuwenhorst1.wleiden.net"
+  dhcp       : False
+  compass    : "150"
+  ns_ip      : "172.16.6.195/29"
+  ns_mac     : "dc:9f:db:2e:b2:c8"
+  bridge_type: "NanoBridge M5"
+  status     : "up"
+
+iface_vr0:
+  comment    : "Link naar noordwijk zuid/west kabel 5 (via switch, met bridge naar kabel 3 )"
+  ip         : "172.16.9.153/29"
+  sdesc      : "il10"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-zw.leeuwenhorst1.wleiden.net"
+  dhcp       : False
+  compass    : "210"
+  ns_ip      : "172.16.9.154/29"
+  ns_mac     : "dc:9f:db:f2:0b:89"
+  bridge_type: "NanoBridge M5"
+  status     : "up"
+
+iface_vr0_alias0:
+  comment    : "Verbinding naar Leeuwenhorst2 via switch"
+  ip         : "172.16.4.189/30"
+  sdesc      : "2leeuwh2"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr1:
+  comment    : "Internetverbinding via StVictor bridge"
+  ip         : "192.168.178.3/24"
+  sdesc      : "2external"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr1_alias0:
+  comment    : "Link naar oost Victorkerk kabel 6 niet meer via switch"
+  ip         : "172.16.6.225/29"
+  sdesc      : "il60"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "60"
+  ssid       : "il-o.leeuwenhorst.wleiden.net"
+  dhcp       : False
+  compass    : "90"
+  ns_ip      : "172.16.6.226/29"
+  ns_mac     : "dc:9f:db:2e:b3:17"
+  bridge_type: "NanoBridge M5"
+  status     : "up"
+
+iface_vr2:
+  comment    : "Link naar NNW (GoudenSpar) kabel 4 v/h ap-zuid "
+  ip         : "172.16.9.145/29"
+  sdesc      : "il350"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-350.leeuwenhorst1.wleiden.net"
+  dhcp       : False
+  compass    : "350"
+  ns_ip      : "172.16.9.146/29"
+  ns_mac     : "dc:9f:db:64:2d:62"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+iface_vr2_alias0:
+  comment    : "Naar GoudenSpar-NanoBrM5 DC:9F:DB:F2:0E:4A 172.16.9.134; router 172.16.9.131"
+  ip         : "172.16.9.129/29"
+  sdesc      : "2goudenspar"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
Index: nodes/Leeuwenhorst2/wleiden.yaml
===================================================================
--- nodes/Leeuwenhorst2/wleiden.yaml	(revision 13401)
+++ nodes/Leeuwenhorst2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,131 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.25110"
+location  : "Leeuwenhorst, Langelaan 3, 2211 XT, Noordwijkerhout"
+longitude : "4.47198"
+masterip  : "172.16.10.225"
+monitoring_group: "noordwijkerhout"
+nodename  : "Leeuwenhorst2"
+nodetype  : "Hybrid"
+portal_sponsor: "Kop en Schotels"
+portal_url: "http://www.kopenschotels.com/nl/home.html"
+rdnap_x   : 92503
+rdnap_y   : 474067
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+iface_ath0:
+  comment    : "AP voor beheer, binnen 2.4 GHz"
+  ip         : "172.16.10.225/29"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11b"
+  channel    : 6
+  ssid       : "WiFi-binnen-b"
+  wlan_mac   : "a8:54:b2:72:c7:cb"
+  dhcp       : "226-230"
+  status     : "up"
+
+iface_ue0:
+  comment    : "Link naar noordwest kabel 8 ; webcam 172.16.9.237"
+  ip         : "172.16.9.233/29"
+  sdesc      : "2nw"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-nw.leeuwenhorst2.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.9.234/29"
+  ns_mac     : "24:a4:3c:0a:54:cb"
+  bridge_type: "Nanosatation M5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar TeyBestuurscentrum kabel 2"
+  ip         : "172.16.6.137/29"
+  sdesc      : "2zuid"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-z.leeuwenhorst.wleiden.net"
+  dhcp       : False
+  compass    : "160"
+  ns_ip      : "172.16.6.138/29"
+  ns_mac     : "dc:9f:db:2e:b7:a8"
+  bridge_type: "NanoBridge M5"
+  status     : "up"
+  
+  
+iface_vr0_alias0:
+  comment    : "Link naar TeyBartholomeus"
+  ip         : "172.16.3.97/29"
+  sdesc      : "2barth"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  status     : "up"
+
+  
+iface_vr1:
+  comment    : "Link naar Duinoord kabel 3 (richting Wouter en Roy via switch, met bridge naar kabel5)"
+  ip         : "172.16.6.185/29"
+  sdesc      : "il335"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-335.leeuwenhorst.wleiden.net"
+  dhcp       : False
+  compass    : "335"
+  ns_ip      : "172.16.6.186/29"
+  ns_mac     : "dc:9f:db:2a:28:9a"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+iface_vr1_alias0:
+  comment    : "Verbinding naar Leeuwenhorst1 via switch"
+  ip         : "172.16.4.190/30"
+  sdesc      : "2leeuwh1"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr2:
+  comment    : "Link naar Wulp kabel 7"
+  ip         : "172.16.7.49/29"
+  sdesc      : "2nw"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-n.leeuwenhorst.wleiden.net"
+  dhcp       : False
+  compass    : "10"
+  ns_ip      : "172.16.7.50/29"
+  ns_mac     : "dc:9f:db:2a:27:dd"
+  bridge_type: "Nanostation M5"
+  status     : "up"
+
+iface_vr2_alias0:
+  comment    : "Link naar noord (TulpEnZee)"
+  ip         : "172.16.7.33/29"
+  sdesc      : "2noord"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  status     : "up"
+
Index: nodes/Leythenrode1/wleiden.yaml
===================================================================
--- nodes/Leythenrode1/wleiden.yaml	(revision 13401)
+++ nodes/Leythenrode1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,115 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.15582"
+location  : "Verpleeghuis Leythenrode, Hoogmadeseweg 55, 2351 CP, Leiderdorp"
+longitude : "4.53564"
+masterip  : "172.17.1.1"
+monitoring_group: "wleiden"
+nodename  : "Leythenrode1"
+nodetype  : "Hybrid"
+rdnap_x   : 96726
+rdnap_y   : 463414
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor de buurt"
+  ip         : "172.17.1.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Leiderdorp-Leythenrode1"
+  wlan_mac   : "00:80:48:54:bb:54"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Ethernet naar interlink west"
+  ip         : "172.16.17.188/29"
+  sdesc      : "2som2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-zo.som2.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.17.187/29"
+  ns_mac     : "00:15:6d:ea:f1:33"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Local 28-subnet to Leythenrode2 and aps"
+  ip         : "172.17.0.1/28"
+  sdesc      : "Leythenrode_subnet"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "ap-nw.leythenrode"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.17.0.5/28"
+  ns_mac     : "00:15:6d:30:d3:2d"
+  bridge_type: "NanoStation2"
+  status     : "up"
+
+iface_vr0_extra0:
+  comment    : "AP "
+  channel    : "6"
+  ssid       : "ap-no.leythenrode"
+  compass    : "zo"
+  type       : "eth"
+  ip         : "172.17.0.6/28"
+  ns_mac     : "00:15:6d:30:d3:2e"
+  bridge_type: "NanoStation2"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Ethernet naar interlink noordoost (graficall)"
+  ip         : "172.16.5.145/29"
+  sdesc      : "2Graficall"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-no.leythenrode.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.5.146/29"
+  ns_mac     : "00:15:6d:bd:8a:06"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "A-link to DeClercq via Nanostation5"
+  ip         : "172.16.5.169/29"
+  sdesc      : "2DeClercq"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-zw.leythenrode.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.5.170/29"
+  ns_mac     : "00:15:6d:bd:8a:02"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/Leythenrode2/wleiden.yaml
===================================================================
--- nodes/Leythenrode2/wleiden.yaml	(revision 13401)
+++ nodes/Leythenrode2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,70 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : " verbonden met 'vuil' internet van Zorggroep Rijnland lokaal ip en nameservers via dhcp LET OP: niet standaard configuratie ivm lokale ap's!"
+gateway   : "192.168.200.1"
+latitude  : "52.15576"
+location  : "Verpleeghuis Leythenrode, Hoogmadeseweg 55, 2351CP, Leiderdorp, werkkast begane grond"
+longitude : "4.53567"
+masterip  : "172.17.7.1"
+monitoring_group: "wleiden"
+nodename  : "Leythenrode2"
+nodetype  : "Hybrid"
+rdnap_x   : 96728
+rdnap_y   : 463407
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: True
+service_proxy_normal: True
+status    : "up"
+
+
+iface_vr0:
+  comment    : "External Link"
+  ip         : "192.168.200.100/24"
+  sdesc      : "2external"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Ethernet"
+  ip         : "172.17.7.1/24"
+  sdesc      : "localsubnet"
+  type       : "eth"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr1_alias0:
+  comment    : "Local 28-subnet to Leythenrode1 and ap bridges zuidkant"
+  ip         : "172.17.0.2/28"
+  sdesc      : "Leythenrode_subnet"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "ap-z.leythenrode"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.17.0.3/28"
+  ns_mac     : "00:15:6d:30:d2:c7"
+  bridge_type: "NanoStation2"
+  status     : "up"
+
+iface_vr1_extra0:
+  comment    : "AP "
+  channel    : "1"
+  ssid       : "ap-z.leythenrode"
+  compass    : "zo"
+  type       : "eth"
+  ip         : "172.17.0.4/28"
+  ns_mac     : "00:15:6d:30:d1:fa"
+  bridge_type: "NanoStation2"
+  status     : "up"
+
+
Index: nodes/Lijtweg1/wleiden.yaml
===================================================================
--- nodes/Lijtweg1/wleiden.yaml	(revision 13401)
+++ nodes/Lijtweg1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,136 @@
+# 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"
+monitoring_group: "wleiden"
+nodename  : "Lijtweg1"
+nodetype  : "Hybrid"
+rdnap_x   : 92344
+rdnap_y   : 466740
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+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       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Oegstgeest"
+  wlan_mac   : "00:1b:b1:05:02:7c"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Extra ap west richting Rabobank"
+  ip         : "172.17.69.1/24"
+  sdesc      : "AP-west"
+  mode       : "ap3"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "2"
+  ssid       : "WiFi-Oegstgeest-3"
+  dhcp       : "10-250"
+  compass    : "w"
+  ns_ip      : "172.17.69.2"
+  ns_mac     : "00:27:22:e2:53:1c"
+  bridge_type: "NanoStationM2"
+  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    : "Link naar Voorhout TEYBestuurscentrum"
+  ip         : "172.16.4.113/29"
+  sdesc      : "2teybc"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "56"
+  ssid       : "il-n.lijtweg1.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.4.114"
+  ns_mac     : "dc:9f:db:2e:0b:03"
+  bridge_type: "NanoBridgeM5"
+  status     : "up"
+
+
+iface_vr0_alias0:
+  comment    : "Link naar Walter en Rene"
+  ip         : "172.16.6.9/29"
+  sdesc      : "2rene"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar xxxx"
+  ip         : "172.16.6.145/29"
+  sdesc      : "2kaag1"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "124"
+  ssid       : "il-o.lijtweg1.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.6.146"
+  ns_mac     : "00:15:6d:70:53:86"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1_alias0:
+  comment    : "Link naar Langevoort"
+  ip         : "172.16.6.241/29"
+  sdesc      : "2langevoort"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  bridge_type: "NanoStation M5"
+  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/Lijtweg2/wleiden.conf.old
===================================================================
--- nodes/Lijtweg2/wleiden.conf.old	(revision 13401)
+++ nodes/Lijtweg2/wleiden.conf.old	(revision 13401)
@@ -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/Lijtweg2/wleiden.yaml
===================================================================
--- nodes/Lijtweg2/wleiden.yaml	(revision 13401)
+++ nodes/Lijtweg2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,141 @@
+# 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"
+monitoring_group: "wleiden"
+nodename  : "Lijtweg2"
+nodetype  : "Hybrid"
+rdnap_x   : 92342
+rdnap_y   : 466702
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+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       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Oegstgeest"
+  wlan_mac   : "00:1b:b1:02:bf:7a"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "InterLink naar Broekplein"
+  ip         : "172.16.5.137/29"
+  sdesc      : "2broekplein"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-ozo.lijtweg2.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.5.138/29"
+  ns_mac     : "00:15:6d:70:4d:d3"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_ue0_alias0:
+  comment    : "InterLink naar Hofwijck"
+  ip         : "172.16.3.105/29"
+  sdesc      : "2hofwijck"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_ue0_alias1:
+  comment    : "Interlink naar KWVdeKaag"
+  ip         : "172.16.17.249/29"
+  sdesc      : "2kwv"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "InterLink naar Rustenborch via switch"
+  ip         : "172.16.6.33/29"
+  sdesc      : "2rustenborch"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "64"
+  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_vr0_alias0:
+  comment    : "Link naar Juffermans via switch nano 172.16.17.147 00:15:6d:f2:43:eb"
+  ip         : "172.16.3.146/29"
+  sdesc      : "2juffermans"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-ono.lijtweg2.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar de Leidse Houtschool"
+  ip         : "172.16.3.113/29"
+  sdesc      : "2lhs"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-z.lijtweg2.wleiden.net"
+  dhcp       : False
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+iface_vr1_alias1:
+  comment    : "Link naar De Kijker "
+  ip         : "172.16.6.97/29"
+  sdesc      : "2dekijker"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr1_alias2:
+  comment    : "Link naar Lebkov "
+  ip         : "172.16.3.129/29"
+  sdesc      : "2lebkov"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr2:
+  comment    : "Ethernet naar Lijtweg1"
+  ip         : "172.16.253.2/30"
+  sdesc      : "2lijtweg1"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
Index: nodes/LivingLab/wleiden.yaml
===================================================================
--- nodes/LivingLab/wleiden.yaml	(revision 13401)
+++ nodes/LivingLab/wleiden.yaml	(revision 13401)
@@ -0,0 +1,105 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+ileiden   : True
+latitude  : "52.14490"
+location  : "Pergolesipad 95, 2324 DG, Leiden"
+longitude : "4.46733"
+masterip  : "172.20.140.1"
+monitoring_group: "wleiden"
+nodename  : "LivingLab"
+nodetype  : "Hybrid"
+rdnap_x   : 92036
+rdnap_y   : 462256
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor de buurt"
+  ip         : "172.20.140.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:0b:6b:81:a9:30"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar Roomburgh2"
+  ip         : "172.16.4.60/29"
+  sdesc      : "2Roomburgh2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-zw.roomburgh2.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.4.59/29"
+  ns_mac     : "00:15:6d:70:51:f5"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Lokaal maar uitgezet ivm reboot probleem"
+  ip         : "0.0.0.0/32"
+  sdesc      : "2lokaal"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar AJSoft2"
+  ip         : "172.16.17.108/29"
+  sdesc      : "2AJSoft2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-w.ajsoft2.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.17.107/29"
+  ns_mac     : "00:15:6d:70:52:60"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Ethernet naar Haagwijk"
+  ip         : "172.16.17.113/29"
+  sdesc      : "2Haagwijk"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-zo.livinglab.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.17.114"
+  ns_mac     : "00:15:6d:70:51:e9"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2_alias0:
+  comment    : "Ethernet naar xxx NSM5 MAC 00:27:22:8A:3B:FB via switch"
+  ip         : "172.16.9.25/29"
+  sdesc      : "2unused"
+  type       : "eth"
+  status     : "up"
+
+
Index: nodes/LucasN/wleiden.yaml
===================================================================
--- nodes/LucasN/wleiden.yaml	(revision 13401)
+++ nodes/LucasN/wleiden.yaml	(revision 13401)
@@ -0,0 +1,97 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+ileiden   : True
+latitude  : "52.16189"
+location  : "Basisschool Lucas van Leyden, Sint Ursulasteeg 28, 2312 XA, Leiden"
+longitude : "4.48684"
+masterip  : "172.17.144.1"
+monitoring_group: "wleiden"
+nodename  : "LucasN"
+nodetype  : "Hybrid"
+rdnap_x   : 93395
+rdnap_y   : 464130
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap"
+  ip         : "172.17.144.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:f1:74:59"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Ethernet naar local"
+  ip         : "0.0.0.0/30"
+  sdesc      : "2local"
+  type       : "eth"
+  dhcp       : "client"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "A-link naar Rabo1"
+  ip         : "172.16.3.25/29"
+  sdesc      : "2rabo1"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "60"
+  ssid       : "il-n.lucasn.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.3.26/29"
+  ns_mac     : "00:15:6d:70:54:ae"
+  bridge_type: "NanoStation5"
+  status     : "down"
+
+
+iface_vr1:
+  comment    : "A-link naar Stadhuis"
+  ip         : "172.16.4.132/29"
+  sdesc      : "2stadhuis"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-nw.stadhuis.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.4.131/29"
+  ns_mac     : "00:15:6d:70:54:53"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Webster"
+  ip         : "172.16.4.177/29"
+  sdesc      : "2webster"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-zw.lucasn.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.4.178/29"
+  ns_mac     : "00:15:6d:70:54:d2"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/Meelfabriek1/wleiden.yaml
===================================================================
--- nodes/Meelfabriek1/wleiden.yaml	(revision 13401)
+++ nodes/Meelfabriek1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,111 @@
+
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.1590278"
+location  : "Meelfabriek, Oosterkerkstraat , 2211 XT, Leiden"
+longitude : "4.504625"
+masterip  : "172.17.131.1"
+monitoring_group: "leiden"
+nodename  : "Meelfabriek1"
+nodetype  : "Hybrid"
+portal_sponsor: "Meelfabriek"
+portal_url: "http://www.demeelfabriek.nl"
+rdnap_x   : 94607
+rdnap_y   : 463796
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+iface_ath0:
+  comment    : "Ap en link naar Meelfabriek2"
+  ip         : "172.16.9.185/29"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11a"
+  channel    : 56
+  ssid       : "ap-Meelfabriek1-binnen"
+  wlan_mac   : "a8:54:b2:72:c7:e4"
+  dhcp       : "187-188"
+  status     : "up"
+
+iface_ue0:
+  comment    : "Link naar zuidoost ztwrijneke kabel 1"
+  ip         : "172.16.9.193/29"
+  sdesc      : "zo"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : 52
+  ssid       : "il-zo.meelfabriek1.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.9.194/29"
+  ns_mac     : "dc:9f:db:64:2e:b3"
+  bridge_type: "NanostationM5"
+  status     : "up"
+
+iface_vr0:
+  comment    : "AP en Link naar poortgebouw kabel 2"
+  ip         : "172.17.152.1/24"
+  sdesc      : "local"
+  mode       : "ap-wds-repeater"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : 64
+  ssid       : "WiFi Leiden a"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.17.152.2"
+  ns_mac     : "24:a4:3c:0a:42:1d"
+  bridge_type: "NanostationM5"
+  status     : "up"
+
+iface_vr1:
+  comment    : "Link naar noordwest Boterhuis kabel 3"
+  ip         : "172.16.9.209/29"
+  sdesc      : "2boterhs"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : 100
+  ssid       : "il-nw.meelfabriek1.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.9.210/29"
+  ns_mac     : "24:a4:3c:0a:3a:97"
+  bridge_type: "Nanostation M5"
+  status     : "up"
+
+iface_vr1_alias0:
+  comment    : "Link naar noordwest AkzoNobel2 kabel 3"
+  ip         : "172.16.5.1/29"
+  sdesc      : "2akzo2"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr2:
+  comment    : "AP-zuid kabel 4 repeater dc:9f:db:62:13:dc 172.17.131.3"
+  ip         : "172.17.131.1/24"
+  sdesc      : "apzuid"
+  mode       : "ap-wds-repeater"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : 11
+  ssid       : "WiFi-Leiden"
+  dhcp       : "10-250"
+  compass    : "z"
+  ns_ip      : "172.17.131.2/24"
+  ns_mac     : "dc:9f:db:62:14:5d"
+  bridge_type: "NanostationM2"
+  status     : "up"
+
+
+
Index: nodes/Meelfabriek2/wleiden.yaml
===================================================================
--- nodes/Meelfabriek2/wleiden.yaml	(revision 13401)
+++ nodes/Meelfabriek2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,110 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.1590278"
+location  : "Meelfabriek, Oosterkerkstraat 18, 2312 SN, Leiden"
+longitude : "4.504625"
+masterip  : "172.17.132.1"
+monitoring_group: "leiden"
+nodename  : "Meelfabriek2"
+nodetype  : "Hybrid"
+portal_sponsor: "Meelfabriek"
+portal_url: "http://www.demeelfabriek.nl"
+rdnap_x   : 94607
+rdnap_y   : 463796
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+iface_ath0:
+  comment    : "link naar Meelfabriek1"
+  ip         : "172.16.9.186/29"
+  sdesc      : "sta"
+  mode       : "sta"
+  type       : "11a"
+  channel    : 56
+  ssid       : "ap-Meelfabriek1-binnen"
+  wlan_mac   : "a8:54:b2:72:c7:c9"
+  dhcp       : False
+  status     : "up"
+
+iface_ue0:
+  comment    : "Link naar noordoost Zijloever kabel 5"
+  ip         : "172.16.9.217/29"
+  sdesc      : "ilno"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-no.meelfabriek2.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.9.218/29"
+  ns_mac     : "24:a4:3c:0a:42:5c"
+  bridge_type: "NanostationM5"
+  status     : "up"
+
+iface_ue0_alias0:
+  comment    : "Link naar noordoost PanTerra1"
+  ip         : "172.16.10.81/29"
+  sdesc      : "2panterra1"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr0:
+  comment    : "Link naar zuidzuidwest kabel 6"
+  ip         : "172.16.9.225/29"
+  sdesc      : "nw"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-zzw.meelfabriek2.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.9.226/29"
+  ns_mac     : "24:a4:3c:0a:42:1e"
+  bridge_type: "NanostationM5"
+  status     : "up"
+
+iface_vr1:
+  comment    : "AP-oost kabel 7"
+  ip         : "172.17.130.1/24"
+  sdesc      : "apoost"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "WiFi-Leiden-2O"
+  dhcp       : "10-250"
+  compass    : "o"
+  ns_ip      : "172.17.130.2/24"
+  ns_mac     : "dc:9f:db:62:14:96"
+  bridge_type: "NanostationM2"
+  status     : "up"
+
+iface_vr2:
+  comment    : "AP-noord kabel 8"
+  ip         : "172.17.132.1/24"
+  sdesc      : "apnoord"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "11"
+  ssid       : "WiFi-Leiden-2N"
+  dhcp       : "10-250"
+  compass    : "n"
+  ns_ip      : "172.17.132.2/24"
+  ns_mac     : "dc:9f:db:62:14:23"
+  bridge_type: "NanostationM2"
+  status     : "up"
+
+
+
Index: nodes/Meerburg/wleiden.yaml
===================================================================
--- nodes/Meerburg/wleiden.yaml	(revision 13401)
+++ nodes/Meerburg/wleiden.yaml	(revision 13401)
@@ -0,0 +1,124 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+gateway   : "192.168.1.1"
+latitude  : "52.14282"
+location  : "RKVV Meerburg, Hans Ecklplein 1, 2382 AZ, Zoeterwoude Rijndijk"
+longitude : "4.51566"
+masterip  : "172.17.22.1"
+monitoring_group: "wleiden"
+no_portal : ['58:12:43:AA:6E:D6']
+nodename  : "Meerburg"
+nodetype  : "Hybrid"
+rdnap_x   : "095341"
+rdnap_y   : 461984
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: True
+service_proxy_normal: True
+status    : "up"
+whitelist : ['58:12:43:AA:6E:D6']
+
+
+iface_ath0:
+  comment    : "Ap binnen RKVV Meerburg"
+  ip         : "172.17.22.1/26"
+  sdesc      : "apbinnen"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Leiden"
+  dhcp       : "10-60"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar JVC"
+  ip         : "172.16.4.244/29"
+  sdesc      : "2jvc"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "60"
+  ssid       : "il-o.jvc.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.4.243/29"
+  ns_mac     : "00:27:22:8a:3d:57"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_ue1:
+  comment    : "Link naar Meerburgkerk"
+  ip         : "172.16.5.81/29"
+  sdesc      : "2meerburgkerk"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-no.meerburg.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.5.82/29"
+  ns_mac     : "00:27:22:8a:3b:2c"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet naar lokaal internet"
+  ip         : "0.0.0.0/30"
+  sdesc      : "2internet"
+  type       : "eth"
+  dhcp       : "client"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Ethernet naar aps-switch"
+  ip         : "172.17.27.1/24"
+  sdesc      : "2aps"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "WiFi-Leiden"
+  channel    : "1"
+  mode       : "ap"
+  dhcp       : "10-254"
+  compass    : "n"
+  ns_ip      : "172.17.27.2/24"
+  ns_mac     : "00:27:22:16:77:77"
+  bridge_type: "NanoStation2"
+  status     : "up"
+
+iface_vr1_extra0:
+  comment    : "AP zuid via switch"
+  channel    : "1"
+  ssid       : "WiFi-Leiden"
+  type       : "eth"
+  compass    : "z"
+  ip         : "172.17.27.3/24"
+  ns_mac     : "00:15:6d:30:d2:b6"
+  bridge_type: "NanoStation2"
+  status     : "up"
+
+iface_vr2:
+  comment    : "Link naar Roomburgh1"
+  ip         : "172.16.5.73/29"
+  sdesc      : "2roomburgh1"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "128"
+  ssid       : "il-nw.meerburg.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.5.74/29"
+  ns_mac     : "00:27:22:10:fd:ea"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
Index: nodes/NieuweEnergie/wleiden.yaml
===================================================================
--- nodes/NieuweEnergie/wleiden.yaml	(revision 13401)
+++ nodes/NieuweEnergie/wleiden.yaml	(revision 13401)
@@ -0,0 +1,75 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "Samen weten we het beter"
+latitude  : "52.16428"
+location  : "Nieuwe energie, 3e Binnenvestgracht 23, 2312 NR, Leiden"
+longitude : "4.491175"
+masterip  : "172.17.6.1"
+monitoring_group: "wleiden"
+nodename  : "NieuweEnergie"
+nodetype  : "Hybrid"
+rdnap_x   : 94478
+rdnap_y   : 466100
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+iface_ath0:
+  comment    : "AP op de mini-pci ath kaart"
+  ip         : "172.17.6.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:f1:74:a2"
+  dhcp       : "10-250"
+  status     : "up"
+
+iface_vr0:
+  comment    : "Ethernet lokaal"
+  ip         : "172.17.127.1/24"
+  sdesc      : "eth"
+  type       : "eth"
+  dhcp       : "10-250"
+  status     : "up"
+
+iface_vr1:
+  comment    : "A-link naar rabo-1 zuid"
+  ip         : "172.16.9.140/29"
+  sdesc      : "2rabo1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-z.rabo1.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.9.139/29"
+  ns_mac     : "dc:9f:db:2a:1d:92"
+  bridge_type: "NanoStation5M"
+  status     : "up"
+
+iface_vr2:
+  comment    : "AP 5ghz"
+  ip         : "172.17.63.1/24"
+  sdesc      : "2binnen5ghz"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "ap5-WirelessLeiden-NieuweEnergie"
+  dhcp       : "10-250"
+  compass    : "tbd"
+  ns_ip      : "172.17.63.2/24"
+  ns_mac     : "dc:9f:db:2a:22:60"
+  bridge_type: "NanoStation5M"
+  status     : "down"
+
+
Index: nodes/OnsBuiten/wleiden.yaml
===================================================================
--- nodes/OnsBuiten/wleiden.yaml	(revision 13401)
+++ nodes/OnsBuiten/wleiden.yaml	(revision 13401)
@@ -0,0 +1,93 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "net4801"
+comment   : "None"
+latitude  : "52.17128"
+location  : "Tuinvereniging Ons Buiten, Joop Vervoornpad 16, 2315KL, Leiden"
+longitude : "4.50628"
+masterip  : "172.17.19.1"
+monitoring_group: "Leiden"
+nodename  : "OnsBuiten"
+nodetype  : "Hybrid"
+portal_sponsor: "Tuinvereniging Ons Buiten"
+portal_url: "http://www.onsbuitenleiden.nl/"
+rdnap_x   : 94738
+rdnap_y   : 465158
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+iface_ath0:
+  comment    : "Lokaal Ap"
+  ip         : "172.17.19.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Leiden"
+  dhcp       : "10-250"
+  status     : "up"
+
+iface_sis0:
+  comment    : "Link west - SOM2"
+  ip         : "172.16.3.252/29"
+  sdesc      : "2som2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "il-o.som2.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.3.251"
+  ns_mac     : "00:15:6D:E8:F9:C6"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+iface_sis1:
+  comment    : "AP zuid en Clubhuis"
+  ip         : "172.17.40.1/24"
+  sdesc      : "ap2"
+  mode       : "ap-repeater"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "11"
+  ssid       : "WiFi Leiden"
+  dhcp       : "10-250"
+  compass    : "z"
+  ns_ip      : "172.17.40.2"
+  ns_mac     : "DC:9F:DB:36:A5:93"
+  bridge_type: "NanoStationM2-Loco"
+  status     : "up"
+
+iface_sis1_extra0:
+  comment    : "Repeater Clubhuis"
+  ip         : "172.17.40.3/24"
+  mode       : "ap-repeater"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ns_mac     : "24:A4:3C:9E:14:74"
+  bridge_type: "BulletM2"
+  status     : "up"
+
+iface_sis2:
+  comment    : "AP zuidwest"
+  ip         : "172.17.101.1/24"
+  sdesc      : "2apzw"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "WiFi Leiden"
+  dhcp       : "10-250"
+  compass    : "zw"
+  ns_ip      : "172.17.101.2/24"
+  ns_mac     : "DC:9F:DB:3E:26:8C"
+  bridge_type: "NanoStationM2-Loco"
+  status     : "up"
+
Index: nodes/PVKerkDuif/wleiden.yaml
===================================================================
--- nodes/PVKerkDuif/wleiden.yaml	(revision 13401)
+++ nodes/PVKerkDuif/wleiden.yaml	(revision 13401)
@@ -0,0 +1,78 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+ileiden   : True
+latitude  : "52.11823"
+location  : "PV De Kerkduif, Nieuweweg 9, 2381 NW,Zoeterwoude "
+longitude : "4.50433"
+masterip  : "172.17.13.1"
+monitoring_group: "wzoeterwoude"
+portal_sponsor: "Free-WiFi Zoeterwoude"
+portal_url: "http://www.dorpsfeestzoeterwoude.nl/"
+nodename  : "PVKerkDuif"
+nodetype  : "Hybrid"
+rdnap_x   : 94532
+rdnap_y   : 459257
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Omni voor Binnen"
+  ip         : "172.17.13.1/26"
+  sdesc      : "2binnen"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "ap-ZTW-PVKerkDuif-Binnen"
+  dhcp       : "10-60"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar switch PVKerkDuif Network, camera c4:d6:55:3e:19:3f at .66"
+  ip         : "172.17.13.65/28"
+  sdesc      : "2building"
+  type       : "eth"
+  dhcp       : "66-78"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link to Zwet"
+  ip         : "172.16.16.172/29"
+  sdesc      : "2zwet"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-o.zwet.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.16.171/29"
+  ns_mac     : "00:15:6d:ec:82:69"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "AccessPoint Sportvelden via NanoStation, peer 00:27:22:E2:53:DD 172.17.20.3"
+  ip         : "172.17.20.1/24"
+  sdesc      : "2sportvelden"
+  mode       : "ap-wds"
+  type       : "eth"
+  channel    : "11"
+  ssid       : "ap-ZTW-PVKerkDuif-Buiten"
+  dhcp       : "11-250"
+  ns_ip      : "172.17.20.2/24"
+  ns_mac     : "00:27:22:80:5a:b6"
+  bridge_type: "NanoStation M2"
+  status     : "up"
+
+
Index: nodes/PanTerra1/wleiden.yaml
===================================================================
--- nodes/PanTerra1/wleiden.yaml	(revision 13401)
+++ nodes/PanTerra1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,109 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.165448"
+location  : "Wilddreef-D, Wilddreef, 2352 CE, Leiderdorp"
+longitude : "4.525617"
+masterip  : "172.17.158.1"
+monitoring_group: "wleiden"
+nodename  : "PanTerra1"
+nodetype  : "Hybrid"
+rdnap_x   : 96052
+rdnap_y   : 464493
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "ap voor buurt zuidwest"
+  ip         : "172.17.159.1/24"
+  wlan_mac   : "a8:54:b2:94:fa:8c"
+  sdesc      : "2omni"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Leiderdorp-1"
+  dhcp       : "10-250"
+  status     : "up"
+
+iface_ue0:
+  comment    : "ap voor buurt zuidwest NanostationM2, switch, kabel 1 "
+  ip         : "172.17.158.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : 11
+  ssid       : "WiFi Leiderdorp"
+  dhcp       : "10-250"
+  ns_ip      : "172.17.158.2/24"
+  ns_mac     : "dc:9f:db:36:1d:af"
+  bridge_type: "NanoStationM2"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar DeClercq NanostationM5 kabel 2"
+  ip         : "172.16.10.105/29"
+  sdesc      : "2zuid"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "128"
+  ssid       : "il-190.panterra1.wleiden.net"
+  dhcp       : False
+  compass    : "190"
+  ns_ip      : "172.16.10.106/29"
+  ns_mac     : "24:a4:3c:0a:41:11"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Meelfabriek2 kabel 3 "
+  ip         : "172.16.10.84/29"
+  sdesc      : "2zw"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-no.meelfabriek2.wleiden.net"
+  dhcp       : False
+  compass    : "240"
+  ns_ip      : "172.16.10.83/29"
+  ns_mac     : "dc:9f:db:2a:1c:81"
+  bridge_type: "NanosatationM5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "PanTerra-link Weversbaan WPA2 5maal6is30:2is15+5=20 LAN1 bridge kabel 4 "
+  ip         : "172.16.10.97/29"
+  sdesc      : "2PTWb"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-PTwb.panterra1.wleiden.net"
+  dhcp       : False
+  compass    : "250"
+  ns_ip      : "172.16.10.98/29"
+  ns_mac     : "dc:9f:db:e4:98:24"
+  bridge_type: "NanosatationM5"
+  status     : "up"
+
+iface_vr2_alias0:
+  comment    : "Link naar Panterra2"
+  ip         : "172.16.4.41/30"
+  sdesc      : "2PT2"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
Index: nodes/PanTerra2/wleiden.yaml
===================================================================
--- nodes/PanTerra2/wleiden.yaml	(revision 13401)
+++ nodes/PanTerra2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,114 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+gateway   : "192.168.1.1"
+latitude  : "52.165448"
+location  : "Wilddreef-D, Wilddreef, 2352 CE, Leiderdorp"
+longitude : "4.525617"
+masterip  : "172.17.162.1"
+monitoring_group: "wleiden"
+nodename  : "PanTerra2"
+nodetype  : "Hybrid"
+rdnap_x   : 96052
+rdnap_y   : 464493
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "ap voor buurt noordoost"
+  ip         : "172.17.162.1/24"
+  wlan_mac   : "90:a4:de:b7:ae:4d"
+  sdesc      : "2omni"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Leiderdorp-2"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar Heineken kabel 1"
+  ip         : "172.16.6.169/29"
+  sdesc      : "2zuidoost"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "128"
+  ssid       : "il-160.panterra2.wleiden.net"
+  dhcp       : False
+  compass    : "90"
+  ns_ip      : "172.16.6.170/29"
+  ns_mac     : "24:a4:3c:0a:38:f7"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar Boterhuis kabel 2"
+  ip         : "172.16.10.73/29"
+  sdesc      : "2n"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-355.panterra2.wleiden.net"
+  dhcp       : False
+  compass    : "355"
+  ns_ip      : "172.16.10.74/29"
+  ns_mac     : "24:a4:3c:72:04:2b"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Graficall kabel 3 "
+  ip         : "172.16.10.52/29"
+  sdesc      : "2zo"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-nw.graficall.wleiden.net"
+  dhcp       : False
+  compass    : "130"
+  ns_ip      : "172.16.10.51/29"
+  ns_mac     : "24:a4:3c:72:05:4d"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "PanTerra-link JvBlaan WPA2 LAN1 bridge kabel 4"
+  ip         : "172.16.10.89/29"
+  sdesc      : "2PTjvb"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "128"
+  ssid       : "il-45.panterra2.wleiden.net"
+  dhcp       : False
+  compass    : "45"
+  ns_ip      : "172.16.10.90/29"
+  ns_mac     : "24:a4:3c:72:04:31"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+iface_vr2_alias0:
+  comment    : "Link naar Panterra1"
+  ip         : "172.16.4.42/30"
+  sdesc      : "2PT1"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+
Index: nodes/Plantsoen/wleiden.yaml
===================================================================
--- nodes/Plantsoen/wleiden.yaml	(revision 13401)
+++ nodes/Plantsoen/wleiden.yaml	(revision 13401)
@@ -0,0 +1,109 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+gateway   : "192.168.42.1"
+latitude  : "52.15395"
+location  : "CeTIM office, Plantsoen 97, 2311 KL, Leiden"
+longitude : "4.49646"
+masterip  : "172.17.169.1"
+monitoring_group: "wleiden"
+nodename  : "Plantsoen"
+nodetype  : "Hybrid"
+rdnap_x   : 94042
+rdnap_y   : 463238
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: True
+service_proxy_normal: True
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor de buurt"
+  ip         : "172.17.169.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:0b:6b:81:1a:a0"
+  dhcp       : "10-250"
+  compass    : "omni"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar ROC1"
+  ip         : "172.16.5.12/29"
+  sdesc      : "2roc1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-n.roc1.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.5.11/29"
+  ns_mac     : "00:27:22:10:fd:a1"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar router"
+  ip         : "192.168.42.200/24"
+  sdesc      : "uplink"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr0_alias0:
+  comment    : "Link naar Radius proxy"
+  ip         : "172.17.169.66/28"
+  sdesc      : "2radius"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Interlink north-north-west (Stadhuis)"
+  ip         : "172.16.5.116/29"
+  sdesc      : "2Stadhuis"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-zo.stadhuis.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  distance   : "0.5 km"
+  ns_ip      : "172.16.5.115/29"
+  ns_mac     : "00:15:6d:bd:67:e8"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link to Vosko3"
+  ip         : "172.16.5.92/29"
+  sdesc      : "2vosko3"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-zo.vosko3.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  distance   : "0.7 km"
+  ns_ip      : "172.16.5.91/29"
+  ns_mac     : "00:15:6d:bd:67:ff"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/Psycho/wleiden.yaml
===================================================================
--- nodes/Psycho/wleiden.yaml	(revision 13401)
+++ nodes/Psycho/wleiden.yaml	(revision 13401)
@@ -0,0 +1,106 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.16962"
+location  : "Pieter de la Courtgebouw, Wassenaarseweg 52, 2333 AK, Leiden"
+longitude : "4.47808"
+masterip  : "172.19.133.1"
+monitoring_group: "wleiden"
+nodename  : "Psycho"
+nodetype  : "Hybrid"
+rdnap_x   : "092806"
+rdnap_y   : 464997
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap"
+  ip         : "172.19.133.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "wiFi-Leiden"
+  wlan_mac   : "00:1b:b1:05:02:ef"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "A-link noord - woutertje pieterse school"
+  ip         : "172.16.16.121/29"
+  sdesc      : "2wp"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-n.psycho.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.16.122/29"
+  ns_mac     : "00:15:6d:70:4d:ae"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_ue0_alias0:
+  comment    : "A-link noord - de leidse houtschool"
+  ip         : "172.16.3.49/29"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "A-link naar UniGorN"
+  ip         : "172.16.16.108/29"
+  sdesc      : "2unigorn"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "104"
+  ssid       : "il-o.unigorn.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.16.107/29"
+  ns_mac     : "00:15:6d:70:4d:a7"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Ethernet to interlink oost"
+  ip         : "172.16.16.116/29"
+  sdesc      : "2som2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-w.som2.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.16.115/29"
+  ns_mac     : "00:15:6d:70:4e:84"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Ethernet unused v/h naar webcam"
+  ip         : "172.16.16.69/30"
+  sdesc      : "2webcam"
+  type       : "eth"
+  dhcp       : False
+  status     : "down"
+
+
Index: nodes/ROC1/wleiden.yaml
===================================================================
--- nodes/ROC1/wleiden.yaml	(revision 13401)
+++ nodes/ROC1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,96 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.14498"
+location  : "ROC Lammenschans, Betaplein 18, 2321 KS, Leiden"
+longitude : "4.49342"
+masterip  : "172.21.0.1"
+monitoring_group: "wleiden"
+nodename  : "ROC1"
+nodetype  : "Hybrid"
+rdnap_x   : 93822
+rdnap_y   : 462243
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap west - 270"
+  ip         : "172.21.0.1/24"
+  sdesc      : "ap-w"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Leiden-w"
+  wlan_mac   : "00:1b:b1:05:03:1a"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue1:
+  comment    : "Link naar Zijloever - 015"
+  ip         : "172.16.5.57/29"
+  sdesc      : "2zijloever"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-no.roc1.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.5.58/29"
+  ns_mac     : "00:27:22:10:fe:52"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet naar ROC2"
+  ip         : "172.16.3.89/30"
+  sdesc      : "2roc2"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Plantsoen2 - 000"
+  ip         : "172.16.5.9/29"
+  sdesc      : "2plantsoen"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-n.roc1.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.5.10/29"
+  ns_mac     : "00:15:6d:70:54:4f"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Haagwijk - 225"
+  ip         : "172.16.17.132/29"
+  sdesc      : "2Haagwijk"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-o.haagwijk.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.17.131/29"
+  ns_mac     : "00:15:6d:70:54:52"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/ROC2/wleiden.yaml
===================================================================
--- nodes/ROC2/wleiden.yaml	(revision 13401)
+++ nodes/ROC2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,103 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.14498"
+location  : "ROC Lammenschans, Betaplein 18, 2321 KS, Leiden"
+longitude : "4.49342"
+masterip  : "172.21.1.1"
+monitoring_group: "wleiden"
+nodename  : "ROC2"
+nodetype  : "Hybrid"
+rdnap_x   : 93822
+rdnap_y   : 462243
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP Noord"
+  ip         : "172.21.1.1/24"
+  sdesc      : "ap-n"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Leiden-n"
+  wlan_mac   : "00:1b:b1:05:01:6a"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar JAR"
+  ip         : "172.16.5.49/29"
+  sdesc      : "2zwet"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-z.roc2.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.5.50/29"
+  ns_mac     : "00:27:22:8a:38:38"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+iface_ue0_alias0:
+  comment    : "Link naar ZTWDorpskerk"
+  ip         : "172.16.5.41/29"
+  sdesc      : "2ztwdorpskerk"
+  type       : "eth"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet naar ROC1"
+  ip         : "172.16.3.90/30"
+  sdesc      : "2roc1"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar JVC - 080"
+  ip         : "172.16.5.36/29"
+  sdesc      : "2jvc"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-w.jvc.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.5.35/29"
+  ns_mac     : "00:27:22:8a:3b:d5"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Grip - 260"
+  ip         : "172.16.5.25/29"
+  sdesc      : "2grip"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-nw.roc2.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.5.26/29"
+  ns_mac     : "00:15:6d:70:50:42"
+  bridge_type: "NanoStation5"
+  status     : "down"
+
+
Index: nodes/Rabo1/wleiden.yaml
===================================================================
--- nodes/Rabo1/wleiden.yaml	(revision 13401)
+++ nodes/Rabo1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,110 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.16950"
+location  : "Rabobank (Oost), Schipholweg 105, 2316 XC, Leiden"
+longitude : "4.48901"
+masterip  : "172.19.136.1"
+monitoring_group: "wleiden"
+nodename  : "Rabo1"
+nodetype  : "Hybrid"
+rdnap_x   : 93554
+rdnap_y   : 464974
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap oost"
+  ip         : "172.19.136.1/24"
+  sdesc      : "ap-o"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:05:03:05"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Ap-noord met SD15"
+  ip         : "172.17.44.1/24"
+  sdesc      : "2apnoord"
+  mode       : "ap"
+  type       : "eth"
+  channel    : "1"
+  ssid       : "WiFi-Leiden-n"
+  dhcp       : "10-250"
+  compass    : "n"
+  ns_ip      : "172.17.44.2/24"
+  ns_mac     : "00:15:6d:e8:f9:5e"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet naar Rabo2"
+  ip         : "172.19.137.65/30"
+  sdesc      : "2rabo2"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "A-link naar Vosko2"
+  ip         : "172.16.4.9/29"
+  sdesc      : "2huub"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-z.rabo1.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.4.10/29"
+  ns_mac     : "00:15:6d:70:53:6a"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1_alias0:
+  comment    : "A-link naar CeTIM2"
+  ip         : "172.16.4.97/29"
+  sdesc      : "2cetim2"
+  type       : "eth"
+  status     : "up"
+
+
+iface_vr1_alias1:
+  comment    : "A-link naar NieuweEnergie"
+  ip         : "172.16.9.137/29"
+  sdesc      : "2cetim2"
+  type       : "eth"
+  status     : "up"
+
+iface_vr2:
+  comment    : "InterLink naar SOM"
+  ip         : "172.16.16.20/29"
+  sdesc      : "2som"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-w.som2.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.16.19/29"
+  ns_mac     : "00:15:6d:70:54:62"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/Rabo2/wleiden.yaml
===================================================================
--- nodes/Rabo2/wleiden.yaml	(revision 13401)
+++ nodes/Rabo2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,79 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.16950"
+location  : "Rabobank (Zuid), Schipholweg 105, 2316 XC, Leiden"
+longitude : "4.48901"
+masterip  : "172.19.137.1"
+monitoring_group: "wleiden"
+nodename  : "Rabo2"
+nodetype  : "Hybrid"
+rdnap_x   : 93554
+rdnap_y   : 464974
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap zuid"
+  ip         : "172.19.137.1/24"
+  sdesc      : "ap-z"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:04:ff:4b"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet naar Rabo1"
+  ip         : "172.19.137.66/30"
+  sdesc      : "2rabo1"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Geluidsnet1"
+  ip         : "172.16.3.196/29"
+  sdesc      : "2geluidsnet1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-n.geluidsnet1.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.3.195/29"
+  ns_mac     : "00:15:6d:ec:81:f1"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "InterLink naar DirkLos2"
+  ip         : "172.16.3.220/29"
+  sdesc      : "2dirklos2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-no.dirklos2.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.3.219/29"
+  ns_mac     : "00:15:6d:70:54:c4"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/Rekpark214a/wleiden.yaml
===================================================================
--- nodes/Rekpark214a/wleiden.yaml	(revision 13401)
+++ nodes/Rekpark214a/wleiden.yaml	(revision 13401)
@@ -0,0 +1,118 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.262683"
+location  : "Recreatiepark,Uiterweg 214,1431AJ,Aalsmeer"
+longitude : "4.731308"
+masterip  : "172.17.134.1"
+monitoring_group: "wleiden"
+nodename  : "Rekpark214a"
+nodetype  : "Hybrid"
+portal_sponsor: "Rekreatiepark Aalsmeer"
+portal_url: "http://www.rekreatieparkaalsmeer.nl/"
+rdnap_x   : "110223"
+rdnap_y   : "475164"
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor de buurt"
+  ip         : "172.17.134.1/24"
+  sdesc      : "ap-omni"
+  mode       : "ap"
+  type       : "11a"
+  channel    : 60
+  ssid       : "ap-westeinder-recpark214a-5GHz"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "AP voor west"
+  ip         : "172.17.135.1/24"
+  sdesc      : "ap-west"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : 6 
+  ssid       : "ap-westeinder-recpark214a-west"
+  dhcp       : "10-250"
+  status     : "up"
+  ns_ip      : "172.17.135.2/24"
+  ns_mac     : "dc:9f:db:36:1e:5c"
+  bridge_type: "NanoStationM2"
+
+
+iface_ue1:
+  comment    : "AP voor oost"
+  ip         : "172.17.129.1/24"
+  sdesc      : "ap-oost"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : 11
+  ssid       : "ap-westeinder-recpark214a-oost"
+  dhcp       : "10-250"
+  status     : "up"
+  ns_ip      : "172.17.129.2/24"
+  ns_mac     : "00:27:22:e2:52:36"
+  bridge_type: "NanoStationM2"
+
+
+iface_vr0:
+  comment    : "Link naar Watertoren3"
+  ip         : "172.16.3.244/29"
+  sdesc      : "2watertoren3"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-w.watertoren3.wleiden.net"
+  dhcp       : False
+  compass    : "O"
+  ns_ip      : "172.16.3.243/29"
+  ns_mac     : "dc:9f:db:f2:12:7b"
+  bridge_type: "NanoBridgeM5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Rekpark214b (korte pad)"
+  ip         : "172.16.6.89/29"
+  sdesc      : "2214b"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-nww.rekpark214a.wleiden.net"
+  dhcp       : False
+  compass    : "nww"
+  ns_ip      : "172.16.6.90/29"
+  ns_mac     : "dc:9f:db:64:23:26"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Rekpark214c (lange pad)"
+  ip         : "172.16.9.161/29"
+  sdesc      : "2214c"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-nw.rekpark214a.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.9.162/29"
+  ns_mac     : "24:a4:3c:0a:41:3c"
+  bridge_type: "NanoStationM5"
+  status     : "up"
Index: nodes/Rekpark214b/wleiden.yaml
===================================================================
--- nodes/Rekpark214b/wleiden.yaml	(revision 13401)
+++ nodes/Rekpark214b/wleiden.yaml	(revision 13401)
@@ -0,0 +1,85 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.262683"
+location  : "Recreatiepark,Uiterweg 214,1431AJ,Aalsmeer"
+longitude : "4.731308"
+masterip  : "172.17.142.1"
+monitoring_group: "wleiden"
+nodename  : "Rekpark214b"
+nodetype  : "Hybrid"
+portal_sponsor: "Rekreatiepark Aalsmeer"
+portal_url: "http://www.rekreatieparkaalsmeer.nl/"
+rdnap_x   : "110223"
+rdnap_y   : "475164"
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor de buurt"
+  ip         : "172.17.142.1/24"
+  sdesc      : "ap-omni"
+  mode       : "ap"
+  type       : "11a"
+  channel    : 60
+  ssid       : "ap-westeinder-recpark214b-5GHz"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "AP voor de buurt"
+  ip         : "172.17.143.1/24"
+  sdesc      : "ap-omni"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : 6 
+  ssid       : "ap-westeinder-recpark214b"
+  dhcp       : "10-250"
+  status     : "up"
+  ns_ip      : "172.17.143.2/24"
+  ns_mac     : "00:27:22:ed:bf:36"
+  bridge_type: "NanoStationM5"
+
+
+iface_vr1:
+  comment    : "Link naar Rekpark214a (loods)"
+  ip         : "172.16.6.92/29"
+  sdesc      : "2rekpark214a"
+  mode       : "client-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "40"
+  ssid       : "il-nww.rekpark214a.wleiden.net"
+  dhcp       : False
+  compass    : "zoo"
+  ns_ip      : "172.16.6.91/29"
+  ns_mac     : "24:A4:3C:0A:54:8B"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Rekpark214c (lange pad)"
+  ip         : "172.16.9.241/29"
+  sdesc      : "2rekpark214c"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "40"
+  ssid       : "il-n.rekpark214b.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.9.242/29"
+  ns_mac     : "DC:9F:DB:64:2D:24"
+  bridge_type: "NanoStationM5"
+  status     : "up"
Index: nodes/Rekpark214c/wleiden.yaml
===================================================================
--- nodes/Rekpark214c/wleiden.yaml	(revision 13401)
+++ nodes/Rekpark214c/wleiden.yaml	(revision 13401)
@@ -0,0 +1,83 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.262683"
+location  : "Recreatiepark,Uiterweg 214,1431AJ,Aalsmeer"
+longitude : "4.731308"
+masterip  : "172.17.145.1"
+monitoring_group: "wleiden"
+nodename  : "Rekpark214c"
+portal_sponsor: "Rekreatiepark Aalsmeer"
+portal_url: "http://www.rekreatieparkaalsmeer.nl/"
+nodetype  : "Hybrid"
+rdnap_x   : "110223"
+rdnap_y   : "475164"
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor de buurt"
+  ip         : "172.17.145.1/24"
+  sdesc      : "ap-omni"
+  mode       : "ap"
+  type       : "11a"
+  channel    : 60
+  ssid       : "ap-westeinder-recpark214c-5GHz"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "AP voor de buurt"
+  ip         : "172.17.146.1/24"
+  sdesc      : "ap-omni"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : 6 
+  ssid       : "ap-westeinder-recpark214c"
+  dhcp       : "10-250"
+  status     : "up"
+  ns_ip      : "172.17.146.2/24"
+  ns_mac     : "00:27:22:66:6d:54"
+  bridge_type: "BulletM2"
+
+iface_vr1:
+  comment    : "Link naar Rekpark214a (loods)"
+  ip         : "172.16.9.164/29"
+  sdesc      : "2rekpark214a"
+  mode       : "client-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-nw.rekpark214a.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.9.163/29"
+  ns_mac     : "DC:9F:DB:65:23:9E"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+iface_vr2:
+  comment    : "Link naar Rekpark214b (korte pad)"
+  ip         : "172.16.9.244/29"
+  sdesc      : "2rekpark214b"
+  mode       : "client-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "40"
+  ssid       : "il-n.rekpark214b.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.9.243/29"
+  ns_mac     : "24:A4:3C:0B:55:C1"
+  bridge_type: "NanoStationM5"
+  status     : "up"
Index: nodes/Rekpark303/wleiden.yaml
===================================================================
--- nodes/Rekpark303/wleiden.yaml	(revision 13401)
+++ nodes/Rekpark303/wleiden.yaml	(revision 13401)
@@ -0,0 +1,109 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.25819"
+location  : "Recreatiepark,Uiterweg 303,1431AJ,Aalsmeer"
+longitude : "4.724687"
+masterip  : "172.17.11.1"
+monitoring_group: "wleiden"
+nodename  : "Rekpark303"
+nodetype  : "Hybrid"
+portal_sponsor: "Rekreatiepark Aalsmeer"
+portal_url: "http://www.rekreatieparkaalsmeer.nl/"
+rdnap_x   : "109766"
+rdnap_y   : "474668"
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor de botenhuis"
+  ip         : "172.17.11.1/24"
+  sdesc      : "ap-omni"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "ap-westeinder-rekpark-botenhuis"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "AP voor de buurt"
+  ip         : "172.17.154.1/24"
+  sdesc      : "2buurt"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "11"
+  ssid       : "ap-westeinder-rekpark"
+  dhcp       : "10-250" 
+  ns_ip      : "172.17.154.2/24"
+  ns_mac     : "00:27:22:ec:bf:33"
+  bridge_type: "BulletM2"
+  status     : "up"
+
+iface_vr0_extra0:
+  comment    : "Geplaatst bij de Caravan"
+  ip         : "172.17.154.4/24"
+  mode       : "repeater"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ns_mac     : "dc:9f:db:3e:1c:65"
+  bridge_type: "NanoLocoM2"
+  status     : "up"
+
+iface_vr1:
+  comment    : "Link naar Watertoren3"
+  ip         : "172.16.16.76/29"
+  sdesc      : "2watertoren3"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-w.watertoren3.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.16.75/29"
+  ns_mac     : "00:0d:b9:1c:ce:b1"
+  bridge_type: "NanoBridgeM5"
+  status     : "up"
+
+iface_vr2:
+  comment    : "Link naar Unused"
+  ip         : "172.16.10.57/29"
+  sdesc      : "2watertoren3"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-w.watertoren3.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.10.58/29"
+  ns_mac     : "00:0d:b9:1c:ce:b2"
+  bridge_type: "NanoStationM5"
+  status     : "down"
+
+iface_ue0:
+  comment    : "Link naar Watertoren3"
+  ip         : "172.16.10.65/29"
+  sdesc      : "2watertoren3"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-w.watertoren3.wleiden.net"
+  dhcp       : False
+  compass    : "e"
+  ns_ip      : "172.16.10.66/29"
+  ns_mac     : "00:80:8a:8e:30:22"
+  bridge_type: "NanoStationM5"
+  status     : "down"
Index: nodes/Rick/wleiden.yaml
===================================================================
--- nodes/Rick/wleiden.yaml	(revision 13401)
+++ nodes/Rick/wleiden.yaml	(revision 13401)
@@ -0,0 +1,85 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+ileiden   : False
+latitude  : "52.14100"
+location  : "Rick  van der Zwet, Brahmslaan 40, 2324 AN, Leiden"
+longitude : "4.47100"
+masterip  : "172.20.145.1"
+monitoring_group: "wleiden"
+nodename  : "Rick"
+nodetype  : "Hybrid"
+rdnap_x   : 92280
+rdnap_y   : 461707
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Wireless for neighboorhood"
+  ip         : "172.20.145.1/26"
+  sdesc      : "binnen"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:0b:6b:34:5a:24"
+  dhcp       : "10-60"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Lokaal Dev Netwerk"
+  ip         : "172.17.37.1/24"
+  sdesc      : "2dev"
+  mode       : "ap-wds"
+  type       : "eth"
+  dhcp       : "10-20"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar RickRing"
+  ip         : "172.16.6.113/28"
+  sdesc      : "2ring"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Access Point West"
+  ip         : "172.20.145.65/26"
+  sdesc      : "west"
+  mode       : "ap-wds"
+  type       : "eth"
+  ssid       : "WiFi-Leiden"
+  dhcp       : "70-120"
+  ns_ip      : "172.20.145.66/26"
+  ns_mac     : "00:15:6d:30:d2:d1"
+  bridge_type: "NanoStation2"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Haagwijk"
+  ip         : "172.16.4.148/29"
+  sdesc      : "2haagwijk"
+  mode       : "station-wds"
+  type       : "eth"
+  ssid       : "il-zw.haagwijk.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.4.147/29"
+  ns_mac     : "00:15:6d:bd:68:99"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/Rick2/wleiden.yaml
===================================================================
--- nodes/Rick2/wleiden.yaml	(revision 13401)
+++ nodes/Rick2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,94 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+gateway   : "192.168.42.1"
+ileiden   : False
+latitude  : "52.14100"
+location  : "Rick  van der Zwet, Brahmslaan 40, 2324 AN, Leiden"
+longitude : "4.47100"
+masterip  : "172.17.34.1"
+monitoring_group: "wleiden"
+nodename  : "Rick2"
+nodetype  : "Hybrid"
+rdnap_x   : 92280
+rdnap_y   : 461707
+rdr_host  : "riff.vanderzwet.net"
+rdr_rules :
+- ['tcp', 9080, '172.17.0.41', 80]
+- ['tcp', 9081, '172.17.0.42', 554]
+- ['tcp', 9082, '172.17.0.43', 554]
+- ['tcp', 9083, '172.17.0.44', 80]
+- ['tcp', 9084, '172.17.0.43', 80]
+- ['tcp', 9085, '172.17.0.42', 80]
+- ['tcp', 9086, '172.17.0.45', 21]
+- ['tcp', 9087, '172.17.0.45', 3389]
+- ['tcp', 9090, '172.17.2.67', 80]
+- ['tcp', 9091, '172.16.9.237', 88]
+- ['tcp', 9092, '172.17.51.5', 80]
+- ['tcp', 9093, '172.16.3.142', 8080]
+- ['tcp', 9094, '172.17.20.5', 80]
+- ['tcp', 9095, '172.17.20.5', 554]
+- ['tcp', 9096, '172.17.13.66', 88]
+- ['tcp', 9097, '172.16.3.190', 8080]
+- ['tcp', 9098, '172.16.3.134', 8080]
+release   : "9.0-RELEASE"
+remote_access: "riff.vanderzwet.net:1022"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: True
+service_proxy_ileiden: True
+service_proxy_normal: True
+status    : "up"
+wl_release: 11047
+
+
+iface_ath0:
+  comment    : "Internal Wireless"
+  ip         : "172.17.34.1/26"
+  sdesc      : "binnen"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Leiden-2"
+  wlan_mac   : "00:80:48:7e:1e:3a"
+  dhcp       : "10-60"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "External Link"
+  ip         : "192.168.42.20/24"
+  sdesc      : "2external"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar RickRing"
+  ip         : "172.16.6.114/28"
+  sdesc      : "2ring"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Lokaal Dev Netwerk"
+  ip         : "172.17.36.1/24"
+  sdesc      : "2dev"
+  type       : "eth"
+  dhcp       : "10-20"
+  status     : "up"
+
+
+iface_vr2_alias0:
+  comment    : "Link naar Ed"
+  ip         : "172.17.2.250/29"
+  sdesc      : "2ed"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
Index: nodes/RijnVliet/wleiden.yaml
===================================================================
--- nodes/RijnVliet/wleiden.yaml	(revision 13401)
+++ nodes/RijnVliet/wleiden.yaml	(revision 13401)
@@ -0,0 +1,105 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.15001"
+location  : "Zorgcentrum Rijn en Vliet, Aaltje Noordewierlaan1, 2324 KP, Leiden"
+longitude : "4.47320"
+masterip  : "172.20.128.1"
+monitoring_group: "wleiden"
+nodename  : "RijnVliet"
+nodetype  : "Hybrid"
+rdnap_x   : 92445
+rdnap_y   : 462819
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor de buurt"
+  ip         : "172.20.128.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Leiden-1"
+  wlan_mac   : "00:1b:b1:02:bf:60"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Ap2"
+  ip         : "172.17.4.1/24"
+  sdesc      : "ap2"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "11"
+  ssid       : "WiFi-Leiden"
+  dhcp       : "10-250"
+  compass    : "zw"
+  ns_ip      : "172.17.4.2"
+  ns_mac     : "00:15:6d:e8:f9:b0"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet naar lokaal (v/h internet gateway)"
+  ip         : "0.0.0.0/30"
+  sdesc      : "2local"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar IMI"
+  ip         : "172.16.5.241/29"
+  sdesc      : "2imi"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "60"
+  ssid       : "il-no.rv.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.5.242/29"
+  ns_mac     : "00:15:6d:ec:82:7c"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1_alias0:
+  comment    : "Link naar Hortus"
+  ip         : "172.16.4.164/29"
+  sdesc      : "2hortus"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar AJSoft2"
+  ip         : "172.16.6.20/29"
+  sdesc      : "2ajsoft"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-o.ajsoft2.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.6.19/29"
+  ns_mac     : "00:15:6d:ec:82:40"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/Robijn/wleiden.yaml
===================================================================
--- nodes/Robijn/wleiden.yaml	(revision 13401)
+++ nodes/Robijn/wleiden.yaml	(revision 13401)
@@ -0,0 +1,107 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+externalif: "ue0"
+gateway   : "192.168.178.1"
+latitude  : "52.15457"
+location  : "Zorgcentrum Robijnhof, Robijnhof 1, 2332 KJ, Leiden"
+longitude : "4.46265"
+masterip  : "172.20.8.1"
+monitoring_group: "wleiden"
+nodename  : "Robijn"
+nodetype  : "Hybrid"
+rdnap_x   : 91729
+rdnap_y   : 463336
+release   : "9.0-RELEASE"
+remote_access: "83.86.137.210:22"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: True
+service_proxy_normal: True
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Omni voor de buurt"
+  ip         : "172.20.8.1/24"
+  sdesc      : "omni"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:0b:6b:81:19:bf"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Uplink"
+  ip         : "192.168.178.5/24"
+  sdesc      : "uplink"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_ue0_alias0:
+  comment    : "Ethernet naar Robijn"
+  ip         : "172.16.3.1/29"
+  sdesc      : "2robijn2"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "A link naar Vosko2 via nanostation"
+  ip         : "172.16.4.84/29"
+  sdesc      : "2vosko2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-w.vosko.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.4.83/29"
+  ns_mac     : "00:15:6d:f2:39:3d"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "A Link naar Robijn3 via nanostation"
+  ip         : "172.16.3.204/29"
+  sdesc      : "2robijn3"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-no.robijn3.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.3.203/29"
+  ns_mac     : "dc:9f:db:e4:98:c9"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "A Link naar AJSoft1 via nanostation"
+  ip         : "172.16.5.228/29"
+  sdesc      : "2ajsoft"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "60"
+  ssid       : "il-nnw.ajsoft1.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.5.227/29"
+  ns_mac     : "00:15:6d:f2:38:07"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/Robijn2/wleiden.yaml
===================================================================
--- nodes/Robijn2/wleiden.yaml	(revision 13401)
+++ nodes/Robijn2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,76 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+gateway   : "192.168.178.1"
+latitude  : "52.15457"
+location  : "Zorgcentrum Robijnhof Recreatiezaal, Robijnhof 1, 2332 KJ, Leiden"
+longitude : "4.46265"
+masterip  : "172.17.97.1"
+monitoring_group: "wleiden"
+nodename  : "Robijn2"
+nodetype  : "Hybrid"
+rdnap_x   : 91729
+rdnap_y   : 463336
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: True
+service_proxy_normal: True
+status    : "up"
+
+
+iface_vr0:
+  comment    : "Uplink"
+  ip         : "192.168.178.6/24"
+  sdesc      : "uplink"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr0_alias0:
+  comment    : "Ethernet naar Robijn via switch"
+  ip         : "172.16.3.2/29"
+  sdesc      : "2robijn"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "AP-noord, kabel 1"
+  ip         : "172.17.98.1/24"
+  sdesc      : "2apnoord"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "ap-WirelessLeiden-RobijnN"
+  dhcp       : "10-240"
+  compass    : "nw"
+  ns_ip      : "172.17.98.2"
+  ns_mac     : "dc:9f:db:36:1d:b7"
+  bridge_type: "NanoStationM2"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "AP-oost, kabel 2"
+  ip         : "172.17.99.1/24"
+  sdesc      : "2apoost"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "ap-WirelessLeiden-RobijnO"
+  dhcp       : "10-240"
+  compass    : "zo"
+  ns_ip      : "172.17.99.2"
+  ns_mac     : "dc:9f:db:36:1d:b5"
+  bridge_type: "NanoStationM2"
+  status     : "up"
+
+
Index: nodes/Robijn3/wleiden.yaml
===================================================================
--- nodes/Robijn3/wleiden.yaml	(revision 13401)
+++ nodes/Robijn3/wleiden.yaml	(revision 13401)
@@ -0,0 +1,136 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.1541"
+location  : "Zorgcentrum Robijnhof, Robijnhof 1, 2332 KJ, Leiden"
+longitude : "4.4619"
+masterip  : "172.17.100.1"
+monitoring_group: "wleiden"
+nodename  : "Robijn3"
+nodetype  : "Hybrid"
+portal_sponsor: "Woonzorgcentrum Robijnhof"
+portal_url: "http://www.libertasleiden.nl/wonen/wonen-met-zorg-dichtbij/woonzorgcentrum-robijnhof/"
+rdnap_x   : 91677
+rdnap_y   : 463284
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Omni voor de buurt"
+  ip         : "172.17.100.1/24"
+  sdesc      : "omni"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "ap-WirelessLeiden-Robijn3"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "A link naar Robijn via nanostation"
+  ip         : "172.16.3.201/29"
+  sdesc      : "2robijn"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-no.robijn3.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.3.202/29"
+  ns_mac     : "dc:9f:db:e4:98:e1"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Unigor1 via nanostation"
+  ip         : "172.16.5.220/29"
+  sdesc      : "2unigor1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "104"
+  ssid       : "il-z.unigor1.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.5.219/29"
+  ns_mac     : "dc:9f:db:e4:98:39"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "AP-zuid, kabel 1 repeaters DC:9F:DB:3E:1C:12, DC:9F:DB:3E:1E:FE, DC:9F:DB:3E:1C:4D, DC:9F:DB:3E:1B:93, DC:9F:DB:3E:20:F8"
+  ip         : "172.17.103.1/24"
+  sdesc      : "2apzuid"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "11"
+  ssid       : "ap-WirelessLeiden-RobijnZ"
+  dhcp       : "10-240"
+  compass    : "nw"
+  ns_ip      : "172.17.103.2"
+  ns_mac     : "dc:9f:db:36:1d:1d"
+  bridge_type: "NanoStationM2"
+  status     : "up"
+
+iface_vr2_extra0:
+  comment    : "AP-repeater "
+  channel    : "11"
+  ssid       : "ap-WirelessLeiden-RobijnZ"
+  type       : "eth"
+  ip         : "172.17.103.3/28"
+  ns_mac     : "dc:9f:db:3e:1c:12"
+  bridge_type: "NanoStationM2-Loco"
+  status     : "up"
+
+iface_vr2_extra1:
+  comment    : "AP-repeater "
+  channel    : "11"
+  ssid       : "ap-WirelessLeiden-RobijnZ"
+  type       : "eth"
+  ip         : "172.17.103.4/28"
+  ns_mac     : "dc:9f:db:3e:1e:fe"
+  bridge_type: "NanoStationM2-Loco"
+  status     : "up"
+
+iface_vr2_extra2:
+  comment    : "AP-repeater "
+  channel    : "11"
+  ssid       : "ap-WirelessLeiden-RobijnZ"
+  type       : "eth"
+  ip         : "172.17.103.5/28"
+  ns_mac     : "dc:9f:db:3e:1c:4d"
+  bridge_type: "NanoStationM2-Loco"
+  status     : "up"
+
+iface_vr2_extra3:
+  comment    : "AP-repeater "
+  channel    : "11"
+  ssid       : "ap-WirelessLeiden-RobijnZ"
+  type       : "eth"
+  ip         : "172.17.103.6/28"
+  ns_mac     : "dc:9f:db:3e:1b:93"
+  bridge_type: "NanoStationM2-Loco"
+  status     : "up"
+
+iface_vr2_extra4:
+  comment    : "AP-repeater "
+  channel    : "11"
+  ssid       : "ap-WirelessLeiden-RobijnZ"
+  type       : "eth"
+  ip         : "172.17.103.6.6/28"
+  ns_mac     : "dc:9f:db:3e:20:f8"
+  bridge_type: "NanoStationM2-Loco"
+  status     : "up"
Index: nodes/Roomburgh1/wleiden.yaml
===================================================================
--- nodes/Roomburgh1/wleiden.yaml	(revision 13401)
+++ nodes/Roomburgh1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,96 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.15095"
+location  : "R.K. Zorgcentrum Roomburgh - noord, Hof van Roomburgh 46, 2314 ZC, Leiden"
+longitude : "4.51315"
+masterip  : "172.18.48.1"
+monitoring_group: "wleiden"
+nodename  : "Roomburgh1"
+nodetype  : "Hybrid"
+rdnap_x   : 95180
+rdnap_y   : 462890
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor de Noordzijde"
+  ip         : "172.18.48.1/24"
+  sdesc      : "ap-n"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:0b:6b:81:a8:b2"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar Rosmolen"
+  ip         : "172.16.3.41/29"
+  sdesc      : "2rosmolen"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "124"
+  ssid       : "il-nnw.roomburgh1.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.3.42/29"
+  ns_mac     : "00:15:6d:ea:f0:62"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Lokaal subnet"
+  ip         : "172.18.49.71/28"
+  sdesc      : "localsubnet"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Meerburg"
+  ip         : "172.16.5.76/29"
+  sdesc      : "2meerburg"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-nw.meerburg.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.5.75/29"
+  ns_mac     : "00:15:6d:ea:ef:87"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Lorentzhof"
+  ip         : "172.16.5.193/29"
+  sdesc      : "2lorentzhof"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-wzw.roomburgh1.wleiden.net"
+  dhcp       : False
+  compass    : "wsw"
+  ns_ip      : "172.16.5.194/29"
+  ns_mac     : "00:15:6d:ea:f0:38"
+  bridge_type: "NanoStation5"
+  status     : "down"
+
+
Index: nodes/Roomburgh2/wleiden.yaml
===================================================================
--- nodes/Roomburgh2/wleiden.yaml	(revision 13401)
+++ nodes/Roomburgh2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,97 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+ileiden   : False
+latitude  : "52.15108"
+location  : "R.K. Zorgcentrum Roomburgh, Hof van Roomburgh 46, 2314 ZC, Leiden"
+longitude : "4.51322"
+masterip  : "172.18.49.1"
+monitoring_group: "wleiden"
+nodename  : "Roomburgh2"
+nodetype  : "Hybrid"
+rdnap_x   : 95185
+rdnap_y   : 462905
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor de Zuidzijde"
+  ip         : "172.18.49.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Leiden-2"
+  wlan_mac   : "00:1b:b1:02:bf:87"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link to Zijloever via Nanostation5"
+  ip         : "172.16.4.233/29"
+  sdesc      : "2zijloever"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-n.roomburgh2.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.4.234/29"
+  ns_mac     : "00:15:6d:ea:f0:28"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Lokaal subnet"
+  ip         : "172.18.49.72/28"
+  sdesc      : "localsubnet"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar DeClercq"
+  ip         : "172.16.5.180/29"
+  sdesc      : "2noordoost"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-w.declercq.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.5.179/29"
+  ns_mac     : "00:15:6d:ea:f0:5f"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar LivingLab"
+  ip         : "172.16.4.57/29"
+  sdesc      : "2LivingLab"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-zw.roomburgh2.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.4.58/29"
+  ns_mac     : "00:15:6d:ea:ef:a7"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/Rosmolen/wleiden.yaml
===================================================================
--- nodes/Rosmolen/wleiden.yaml	(revision 13401)
+++ nodes/Rosmolen/wleiden.yaml	(revision 13401)
@@ -0,0 +1,121 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.17732"
+location  : "Openbare Bibliotheek locatie Merenwijk, Rosmolen 4, 2317 SJ, Leiden"
+longitude : "4.50479"
+masterip  : "172.21.168.1"
+monitoring_group: "wleiden"
+nodename  : "Rosmolen"
+nodetype  : "Hybrid"
+rdnap_x   : 94644
+rdnap_y   : 465831
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap voor de buurt"
+  ip         : "172.21.168.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:05:02:d4"
+  dhcp       : "10-250"
+  compass    : "wirelessleiden"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "b-link naar HenkJan"
+  ip         : "172.16.9.113/29"
+  sdesc      : "2henkjan"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "il-nnw.rosmolen.wleiden.net"
+  dhcp       : "117-118"
+  compass    : "w"
+  ns_ip      : "172.16.9.114/29"
+  ns_mac     : "00:15:6d:e8:f9:34"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+
+iface_ue1:
+  comment    : "Link naar xxxx"
+  ip         : "172.16.2.57/30"
+  sdesc      : "2xxxx"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "3"
+  ssid       : "il-nw2.rosmolen.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.3.74/29"
+  ns_mac     : "00:15:6d:"
+  bridge_type: "NanoStation M5"
+  status     : "down"
+
+
+iface_vr0:
+  comment    : "A-link naar Broekplein"
+  ip         : "172.16.5.132/29"
+  sdesc      : "2Broekplein"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-z.broekplein.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.5.131/29"
+  ns_mac     : "00:15:6d:70:54:c5"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Roomburgh1"
+  ip         : "172.16.3.44/29"
+  sdesc      : "2roomburgh1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "124"
+  ssid       : "il-nnw.roomburgh1.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.3.43/29"
+  ns_mac     : "00:15:6d:70:54:d9"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Regenboog"
+  ip         : "172.16.5.201/29"
+  sdesc      : "2regenboog"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "11"
+  ssid       : "il-o.rosmolen.wleiden.net"
+  dhcp       : False
+  compass    : "e"
+  ns_ip      : "172.16.5.202/29"
+  ns_mac     : "00:15:6d:e8:f9:3d"
+  bridge_type: "Bullet2"
+  status     : "down"
+
+
Index: nodes/Rund/wleiden.yaml
===================================================================
--- nodes/Rund/wleiden.yaml	(revision 13401)
+++ nodes/Rund/wleiden.yaml	(revision 13401)
@@ -0,0 +1,79 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+ileiden   : True
+latitude  : "52.16114"
+location  : "Dirk-Willem, Jan Vossensteeg/Rundermakt, 2312 WC, Leiden"
+longitude : "4.49224"
+masterip  : "172.17.160.1"
+monitoring_group: "wleiden"
+nodename  : "Rund"
+nodetype  : "Hybrid"
+rdnap_x   : 93763
+rdnap_y   : 464042
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "down"
+
+
+iface_ath0:
+  comment    : "Ap"
+  ip         : "172.17.161.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Leiden"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link to external interface"
+  ip         : "172.17.160.65/28"
+  sdesc      : "2external"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Geluidsnet2"
+  ip         : "172.16.4.212/29"
+  sdesc      : "2geluidsnet2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "64"
+  ssid       : "il-o.geluidsnet2.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.4.211/29"
+  ns_mac     : "00:27:22:8a:3d:a7"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar vosko2"
+  ip         : "172.16.17.156/29"
+  sdesc      : "2vosko2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-no.vosko2.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.17.155/29"
+  ns_mac     : "00:27:22:10:d8:43"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
Index: nodes/Rustdam/wleiden.yaml
===================================================================
--- nodes/Rustdam/wleiden.yaml	(revision 13401)
+++ nodes/Rustdam/wleiden.yaml	(revision 13401)
@@ -0,0 +1,89 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+gateway   : "192.168.178.1"
+latitude  : "52.11082"
+location  : "Kaasboerderij Rustdam, Zuidbuurtseweg 34, 2381 LG, Zoeterwoude "
+longitude : "4.50254"
+masterip  : "172.17.50.1"
+monitoring_group: "wzoeterwoude"
+nodename  : "Rustdam"
+nodetype  : "Hybrid"
+rdnap_x   : "94400"
+rdnap_y   : "458435"
+release   : "9.0-RELEASE"
+remote_access: "83.85.202.106:1022"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ue0:
+  comment    : "Link to StJan"
+  ip         : "172.16.6.4/29"
+  sdesc      : "2stjan"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-nw.stjan.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.6.3/29"
+  ns_mac     : "dc:9f:db:2a:1d:eb"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link to house"
+  ip         : "172.16.7.97/29"
+  sdesc      : "2house"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-o.rustdam.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.7.98/29"
+  ns_mac     : "00:00:00:00:00:00"
+  ns_type    : "ns5"
+  bridge_type: "NanoStation5M"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Access Point - AirCam (00:27:22:60:43:F1) 172.17.51.5/24"
+  ip         : "172.17.51.1/24"
+  sdesc      : "2veld"
+  mode       : "ap-wds"
+  type       : "eth"
+  ssid       : "ap-ZTW-Rustdam-BosVeld"
+  dhcp       : "10-240"
+  ns_ip      : "172.17.51.2/24"
+  ns_mac     : "00:00:00:00:00:00"
+  ns_type    : "ns2"
+  bridge_type: "NanoStation2"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Access Point"
+  ip         : "172.17.52.1/24"
+  sdesc      : "2veld"
+  mode       : "ap-wds"
+  type       : "eth"
+  ssid       : "ap-ZTW-Rustdam-WeideVeld"
+  dhcp       : "10-240"
+  ns_ip      : "172.17.52.2/24"
+  ns_mac     : "00:00:00:00:00:00"
+  ns_type    : "ns2"
+  bridge_type: "NanoStation2"
+  status     : "up"
+
+
Index: nodes/Rustdam2/wleiden.yaml
===================================================================
--- nodes/Rustdam2/wleiden.yaml	(revision 13401)
+++ nodes/Rustdam2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,88 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+gateway   : "192.168.178.1"
+latitude  : "52.11082"
+location  : "Kaasboerderij Rustdam, Zuidbuurtseweg 34, 2381 LG, Zoeterwoude "
+longitude : "4.50254"
+masterip  : "172.17.95.1"
+monitoring_group: "wzoeterwoude"
+nodename  : "Rustdam2"
+nodetype  : "Hybrid"
+rdnap_x   : "94400"
+rdnap_y   : "458435"
+rdr_host  : "94.208.120.3"
+rdr_rules :
+- ['tcp', 9080, '172.17.0.41', 80]
+- ['tcp', 9081, '172.17.0.42', 554]
+- ['tcp', 9082, '172.17.0.43', 554]
+- ['tcp', 9083, '172.17.0.44', 80]
+- ['tcp', 9084, '172.17.0.43', 80]
+- ['tcp', 9085, '172.17.0.42', 80]
+- ['tcp', 9086, '172.17.0.45', 21]
+- ['tcp', 9087, '172.17.0.45', 3389]
+- ['tcp', 9090, '172.17.2.67', 80]
+- ['tcp', 9091, '172.16.9.237', 88]
+- ['tcp', 9092, '172.17.51.5', 80]
+- ['tcp', 9096, '172.17.13.66', 88]
+- ['tcp', 9100, '172.16.9.202', 88]
+release   : "9.0-RELEASE"
+remote_access: "94.210.143.85:1022"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: True
+service_proxy_ileiden: True
+service_proxy_normal: True
+status    : "up"
+
+
+iface_vr0:
+  comment    : "Uplink"
+  ip         : "192.168.178.5/24"
+  sdesc      : "uplink"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr0_alias0:
+  comment    : "Webcam - prive"
+  ip         : "172.16.9.201/29"
+  sdesc      : "uplink"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link to Rustdam"
+  ip         : "172.16.7.100/29"
+  sdesc      : "2rustdam"
+  mode       : "station-wds"
+  type       : "eth"
+  ssid       : "il-o.rustdam.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.7.99/29"
+  ns_mac     : "00:00:00:00:00:00"
+  ns_type    : "ns5"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Access Point"
+  ip         : "172.17.95.1/24"
+  sdesc      : "2terras"
+  mode       : "ap-wds"
+  type       : "eth"
+  ssid       : "ap-ZTW-Rustdam-Terras"
+  dhcp       : "10-240"
+  ns_ip      : "172.17.95.2/24"
+  ns_mac     : "00:00:00:00:00:00"
+  ns_type    : "bullet2"
+  bridge_type: "BulletM2"
+  status     : "up"
+
+
Index: nodes/Rustenborch/wleiden.yaml
===================================================================
--- nodes/Rustenborch/wleiden.yaml	(revision 13401)
+++ nodes/Rustenborch/wleiden.yaml	(revision 13401)
@@ -0,0 +1,78 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.18218"
+location  : "Zorgcentrum Rustenborch, Van Wijckersloothplein 3, 2341 BB, Oegstgeest"
+longitude : "4.46392"
+masterip  : "172.23.24.1"
+monitoring_group: "wleiden"
+nodename  : "Rustenborch"
+nodetype  : "Hybrid"
+rdnap_x   : 91855
+rdnap_y   : 466407
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap"
+  ip         : "172.23.24.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Oegstgeest"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet naar lokaal"
+  ip         : "172.17.0.81/29"
+  sdesc      : "eth"
+  type       : "eth"
+  dhcp       : "82-85"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Lijtweg2, is down"
+  ip         : "172.16.6.36/29"
+  sdesc      : "2lijtweg2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "64"
+  ssid       : "il-w.lijtweg2.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.6.35"
+  ns_mac     : "00:15:6d:70:54:67"
+  bridge_type: "NanoStation5"
+  status     : "down"
+
+
+iface_vr2:
+  comment    : "Link naar UniGorN"
+  ip         : "172.16.17.244/29"
+  sdesc      : "2unigorn"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "128"
+  ssid       : "il-n.unigorn.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.17.243/29"
+  ns_mac     : "00:15:6d:70:54:cc"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/SOM1/wleiden.yaml
===================================================================
--- nodes/SOM1/wleiden.yaml	(revision 13401)
+++ nodes/SOM1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,126 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.16950"
+location  : "Luba, Eschertoren 1A, 2316 ET, Leiden"
+longitude : "4.49378"
+masterip  : "172.21.160.1"
+monitoring_group: "wleiden"
+nodename  : "SOM1"
+nodetype  : "Hybrid"
+rdnap_x   : 93880
+rdnap_y   : 464970
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap noord"
+  ip         : "172.21.160.1/24"
+  sdesc      : "ap-n"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Leiden-1"
+  wlan_mac   : "00:1b:b1:02:bf:88"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Interlink naar JorisdeWitte"
+  ip         : "172.16.7.9/29"
+  sdesc      : "2jorisdw"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-nnw.som1.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.7.10"
+  ns_mac     : "24:a4:3c:0a:54:99"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet naar SOM2"
+  ip         : "172.16.3.137/30"
+  sdesc      : "2som2"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Broekplein"
+  ip         : "172.16.5.121/29"
+  sdesc      : "2broekplein"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-n.som1.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.5.122/29"
+  ns_mac     : "00:15:6d:ec:7a:51"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1_alias0:
+  comment    : "Link naar Juffermans"
+  ip         : "172.16.3.161/29"
+  sdesc      : "2Juffermans"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+iface_vr1_alias1:
+  comment    : "Link naar OudeRaadhuis"
+  ip         : "172.16.9.57/29"
+  sdesc      : "2raadhuis"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+iface_vr2:
+  comment    : "Link naar Stadhuis"
+  ip         : "172.16.3.169/29"
+  sdesc      : "2Stadhuis"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-z.som1.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.3.170/29"
+  ns_mac     : "00:15:6d:ec:82:a9"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2_alias0:
+  comment    : "Link naar Houtmarkt"
+  ip         : "172.16.17.217/29"
+  sdesc      : "2Houtmarkt"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
Index: nodes/SOM2/wleiden.yaml
===================================================================
--- nodes/SOM2/wleiden.yaml	(revision 13401)
+++ nodes/SOM2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,117 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+ileiden   : True
+latitude  : "52.16950"
+location  : "Luba, Eschertoren 1A, 2316 ET, Leiden"
+longitude : "4.49378"
+masterip  : "172.17.2.1"
+monitoring_group: "wleiden"
+nodename  : "SOM2"
+nodetype  : "Hybrid"
+rdnap_x   : 93880
+rdnap_y   : 464970
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+iface_ath0:
+  comment    : "Ap zuidoost"
+  ip         : "172.17.2.1/26"
+  sdesc      : "ap-zo"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:02:be:1c"
+  dhcp       : "10-60"
+  status     : "up"
+
+iface_ue0:
+  comment    : "link Tuinvereniging Ons Buiten"
+  ip         : "172.16.3.249/29"
+  sdesc      : "2onsbuiten"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "il-o.som2.wleiden.net"
+  dhcp       : False
+  ns_ip      : "172.16.3.250"
+  ns_mac     : "00:15:6d:e8:f9:b6"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+iface_ue0_extra0:
+  comment    : "wirelessantwerpen speeltje WB-Leiden"
+  type       : "eth"
+  ip         : "172.17.2.67/26"
+  ns_mac     : " "
+  bridge_type: ""
+  status     : "up"
+
+iface_vr0:
+  comment    : "Ethernet naar SOM1"
+  ip         : "172.16.3.138/30"
+  sdesc      : "2som1"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr1:
+  comment    : "Link naar Rabo"
+  ip         : "172.16.16.17/29"
+  sdesc      : "2Rabo"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-w.som2.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.16.18/29"
+  ns_mac     : "00:15:6d:ec:82:a8"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+iface_vr1_alias0:
+  comment    : "Link naar Psycho"
+  ip         : "172.16.16.113/29"
+  sdesc      : "2Psycho"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+iface_vr2:
+  comment    : "Link naar Leythenrode"
+  ip         : "172.16.17.185/29"
+  sdesc      : "2leythenrode"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-zo.som2.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.17.186/29"
+  ns_mac     : "00:15:6d:f2:38:cd"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+iface_vr2_alias0:
+  comment    : "Link naar Zijloever"
+  ip         : "172.16.4.225/29"
+  sdesc      : "2Zijloever"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  bridge_type: "NanoStation M5"
+  status     : "up"
Index: nodes/StBavo1/wleiden.yaml
===================================================================
--- nodes/StBavo1/wleiden.yaml	(revision 13401)
+++ nodes/StBavo1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,94 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+gateway   : "192.168.178.1"
+latitude  : "52.19183"
+location  : "Sint Bavo Kerk, Leidse weg 6, 2374 AL, Oud-Ade"
+longitude : "4.56611"
+masterip  : "172.16.3.93"
+monitoring_group: "wleiden"
+nodename  : "StBavo1"
+nodetype  : "Hybrid"
+rdnap_x   : 98856
+rdnap_y   : 467396
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: True
+service_proxy_normal: True
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Link naar StBavo2"
+  ip         : "172.16.3.93/30"
+  sdesc      : "2stbavo2"
+  mode       : "ap"
+  type       : "11a"
+  channel    : 44
+  ssid       : "il-intern.stbavo1.wleiden.net"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Internet verbinding"
+  ip         : "192.168.178.2/24"
+  sdesc      : "2external"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr0_alias0:
+  comment    : "Interlink naar pastorie Nanostation M5 DC:9F:DB:64:2C:DF kabel 4"
+  ip         : "172.16.9.1/29"
+  sdesc      : "2pastorie"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "128"
+  ssid       : "il-o.stbavo1.wleiden.net"
+  ns_ip      : "172.16.9.2/29"
+  ns_mac     : "dc:9f:db:64:2f:77"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Kaag2 kabel 3"
+  ip         : "172.16.7.249/29"
+  sdesc      : "2kaag2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-z.kaag2.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.7.250/29"
+  ns_mac     : "dc:9f:db:64:2e:bd"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link to KWVdeKaag kabel 5"
+  ip         : "172.16.7.241/29"
+  sdesc      : "2kwdekaag"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-w.stbavo1.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.7.242/29"
+  ns_mac     : "dc:9f:db:64:2f:07"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
Index: nodes/StBavo2/wleiden.yaml
===================================================================
--- nodes/StBavo2/wleiden.yaml	(revision 13401)
+++ nodes/StBavo2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,106 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.19183"
+location  : "Sint Bavo Kerk, Leidse weg 6, 2374 AL, Oud-Ade"
+longitude : "4.56611"
+masterip  : "172.17.121.1"
+monitoring_group: "wleiden"
+nodename  : "StBavo2"
+nodetype  : "Hybrid"
+rdnap_x   : 98856
+rdnap_y   : 467396
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Link naar StBavo1, N.B. station modus!"
+  ip         : "172.16.3.94/30"
+  sdesc      : "2stbavo1"
+  mode       : "sta"
+  type       : "11a"
+  channel    : 44
+  ssid       : "il-intern.stbavo1.wleiden.net"
+  dhcp       : False
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "AP voor de buurt - kabel 7"
+  ip         : "172.17.122.1/24"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "ap-WirelessLeiden-StBavo-Zuid"
+  dhcp       : "10-250"
+  ns_ip      : "172.17.122.2/24"
+  ns_mac     : "dc:9f:db:36:1d:f0"
+  bridge_type: "NanoStation2M"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Interlink naar noordoost ongebruikt - kabel 2"
+  ip         : "172.16.9.9/29"
+  sdesc      : "2noord"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-no.stbavo2.wleiden.net"
+  compass    : "no"
+  ns_ip      : "172.16.9.10/29"
+  ns_mac     : "dc:9f:db:64:2f:10"
+  bridge_type: "Nanostation M5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar HMKerk - kabel 3"
+  ip         : "172.16.9.17/29"
+  sdesc      : "2zo"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-zo.stbavo2.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.9.18/29"
+  ns_mac     : "dc:9f:db:64:2d:27"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1_alias0:
+  comment    : "Link naar GHR"
+  ip         : "172.16.3.122/29"
+  sdesc      : "2ghr"
+  type       : "eth"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "AP voor de buurt - kabel 6"
+  ip         : "172.17.121.1/24"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "ap-WirelessLeiden-StBavo-Noord"
+  dhcp       : "10-250"
+  ns_ip      : "172.17.121.2/24"
+  ns_mac     : "00:27:22:e2:53:e1"
+  bridge_type: "NanoStation2M"
+  status     : "up"
+
+
Index: nodes/StJan/wleiden.yaml
===================================================================
--- nodes/StJan/wleiden.yaml	(revision 13401)
+++ nodes/StJan/wleiden.yaml	(revision 13401)
@@ -0,0 +1,189 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+latitude  : "52.10902"
+location  : "Kerk St Jans Onthoofding, Zuidbuurtseweg 13, 2381 LB Zoeterwoude"
+longitude : "4.50357"
+masterip  : "172.17.66.1"
+monitoring_group: "wleiden"
+nodename  : "StJan"
+nodetype  : "Hybrid"
+portal_sponsor: "Gezamenlijke kerken Zoeterwoude Dorp"
+portal_url: "http://www.kerkvanzoeterwoude.nl/"
+rdnap_x   : 94468
+rdnap_y   : 458233
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "PA4040 voor zuid"
+  ip         : "172.17.66.1/24"
+  sdesc      : "2apzuid"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "ap-ZTW-StJan"
+  dhcp       : "10-240"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "AP noord kabelnr.3"
+  ip         : "172.17.67.1/24"
+  sdesc      : "2apnoord"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "ap-ZTW-StJan-Noord"
+  dhcp       : "10-240"
+  ns_ip      : "172.17.67.2/24"
+  ns_mac     : "00:27:22:e2:53:2a"
+  bridge_type: "NanoStation2M"
+  status     : "up"
+
+
+iface_ue0_extra0:
+  comment    : "Zuidbuurtseweg 34"
+  ip         : "172.17.67.3/24"
+  mode       : "repeater"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ns_mac     : "00:15:6d:ad:d7:e5"
+  bridge_type: "NanoStation2"
+  status     : "up"
+
+
+iface_ue0_extra1:
+  comment    : "Zuidbuurtseweg 34"
+  ip         : "172.17.67.4/24"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "ap-ZTW-Rummicub"
+  ns_mac     : "00:15:6d:d4:f8:03"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+
+iface_ue1:
+  comment    : "AP oost kabelnr.2"
+  ip         : "172.17.68.1/24"
+  sdesc      : "2apoost"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "ap-ZTW-StJan-Oost"
+  dhcp       : "10-240"
+  compass    : "w"
+  ns_ip      : "172.17.68.2/24"
+  ns_mac     : "00:27:22:e2:53:e7"
+  bridge_type: "NanoStation M2"
+  status     : "up"
+
+iface_ue1_extra0:
+  comment    : "BuurtHuis De Weipoort"
+  ip         : "172.17.68.3/24"
+  mode       : "repeater"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ns_mac     : "DC:9F:DB:3E:1E:D2"
+  bridge_type: "NanoStation2Loco"
+  status     : "up"
+
+
+iface_ue1_extra1:
+  comment    : "Zuidbuurtseweg 34"
+  ip         : "172.17.68.4/24"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "ap-ZTW-BuurthuisDeWeipoort"
+  ns_mac     : "00:00:00:00:00:00"
+  bridge_type: "NanoStation2Loco"
+  status     : "planned"
+
+iface_vr0:
+  comment    : "Link naar Dorpskerk kabelnr.4"
+  ip         : "172.16.5.105/29"
+  sdesc      : "2dorp"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-nw.stjan.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.5.106/29"
+  ns_mac     : "00:27:22:8a:3b:ca"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr0_alias0:
+  comment    : "Link naar Rustdam"
+  ip         : "172.16.6.1/29"
+  sdesc      : "2rustdam"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr0_alias1:
+  comment    : "Link naar TUDelft kabelnr.5"
+  ip         : "172.16.7.228/29"
+  sdesc      : "2tud"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "48"
+  ssid       : "il-nno.tudelft.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.7.227/29"
+  ns_mac     : "00:27:22:8a:3d:1f"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Rijneke kabelnr.6"
+  ip         : "172.16.3.236/29"
+  sdesc      : "2Rijneke"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "60"
+  ssid       : "il-zw.rijneke.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.3.235"
+  ns_mac     : "00:27:22:8a:3b:f5"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Gelderswoude kabelnr. 1"
+  ip         : "172.16.3.225/29"
+  sdesc      : "2gelderswd"
+  mode       : "ap-wds"
+  type       : "eth"
+  channel    : "100"
+  ssid       : "il-zo.stjan.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.3.226/29"
+  ns_mac     : "dc:9f:db:2a:1d:0c"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
Index: nodes/StVictor/wleiden.yaml
===================================================================
--- nodes/StVictor/wleiden.yaml	(revision 13401)
+++ nodes/StVictor/wleiden.yaml	(revision 13401)
@@ -0,0 +1,112 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+gateway   : "192.168.178.1"
+latitude  : "52.250914"
+location  : "Sint Victor kerk, St Victorlaan 11, 2211 RN, Noordwijkerhout"
+longitude : "4.489229"
+masterip  : "172.17.119.1"
+monitoring_group: "noordwijk"
+nodename  : "StVictor"
+nodetype  : "Hybrid"
+rdnap_x   : 93680
+rdnap_y   : 474031
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: True
+service_proxy_normal: True
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Accesspoint Zuid op sectorantenne"
+  ip         : "172.17.119.1/24"
+  sdesc      : "apz"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "ap-stvictor-z"
+  dhcp       : "10-250"
+  compass    : "n"
+  status     : "up"
+
+iface_ue0:
+  comment    : "Accesspoint Noord op NanoStation"
+  ip         : "172.17.133.1/24"
+  sdesc      : "apoost"
+  mode       : "apn"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "ap-stvictor-n"
+  dhcp       : "10-250"
+  compass    : "n"
+  ns_ip      : "172.17.133.2/24"
+  ns_mac     : "dc:9f:db:62:14:9b"
+  bridge_type: "NanoStationM2"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Internetverbinding"
+  ip         : "192.168.178.2/24"
+  sdesc      : "2external"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr0_alias0:
+  comment    : "naar pastorie NanostationM5 LAN1 bridge > nano vr1 WPA2"
+  ip         : "172.16.9.105/29"
+  sdesc      : "2pastorie"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-nw.stvictor.wleiden.net"
+  compass    : "nw"
+  ns_ip      : "172.16.9.106/29"
+  ns_mac     : "24:a4:3c:72:01:cf"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "naar Leeuwenhorst1 NanostationM5 LAN1 bridge > nano vr0"
+  ip         : "172.16.6.228/29"
+  sdesc      : "2lwhorst"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "60"
+  ssid       : "il-o.leeuwenhorst.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.6.227/29"
+  ns_mac     : "24:a4:3c:72:02:29"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar AkzoNobel1"
+  ip         : "172.16.10.36/29"
+  sdesc      : "2akzo"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "120"
+  ssid       : "il-n.teyakzonobel1.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.10.35/29"
+  ns_mac     : "24:a4:3c:72:02:13"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
Index: nodes/Stadhuis/wleiden.yaml
===================================================================
--- nodes/Stadhuis/wleiden.yaml	(revision 13401)
+++ nodes/Stadhuis/wleiden.yaml	(revision 13401)
@@ -0,0 +1,267 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "net6501"
+comment   : "None"
+latitude  : "52.15805"
+location  : "Stadhuis, Stadhuisplein 1, 2311 EJ, Leiden"
+longitude : "4.49094"
+masterip  : "172.17.141.1"
+monitoring_group: "wleiden"
+nodename  : "Stadhuis"
+nodetype  : "Hybrid"
+rdnap_x   : 93670
+rdnap_y   : 463699
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_sis0:
+  comment    : "AP-zuid via Bullet2"
+  ip         : "172.17.29.1/24"
+  sdesc      : "2APzuid"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "WiFi-Leiden-z"
+  dhcp       : "10-250"
+  ns_ip      : "172.17.29.2"
+  ns_mac     : "00:15:6d:d4:f8:34"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+
+iface_sis1:
+  comment    : "Ethernet to interlink west (Vosko3)"
+  ip         : "172.16.5.68/29"
+  sdesc      : "2Vosko3"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-o.vosko3.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  distance   : "0.5 km"
+  ns_ip      : "172.16.5.67/29"
+  ns_mac     : "00:15:6d:bd:8a:b2"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_sis2:
+  comment    : "AP west via Bullet2"
+  ip         : "172.17.30.1/24"
+  sdesc      : "2APwest"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "11"
+  ssid       : "WiFi-Leiden-w"
+  dhcp       : "10-250"
+  compass    : "nw"
+  distance   : "1.8 km"
+  ns_ip      : "172.17.30.2"
+  ns_mac     : "00:15:6d:d4:f8:05"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+
+iface_sis3:
+  comment    : "Ethernet to interlink north-west (Cope)"
+  ip         : "172.16.3.177/29"
+  sdesc      : "2cope"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-nw.stadhuis.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  distance   : "1.8 km"
+  ns_ip      : "172.16.3.178/29"
+  ns_mac     : "00:15:6d:bd:69:35"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_sis3_alias0:
+  comment    : "Ethernet to interlink north-west (LucasN)"
+  ip         : "172.16.4.129/29"
+  sdesc      : "2LucasN"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_sis3_alias1:
+  comment    : "Ethernet to interlink north-west (DirkLos2)"
+  ip         : "172.16.3.73/29"
+  sdesc      : "2DirkLos2"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Lokaal ethernet naar 4 nano2-accesspoints"
+  ip         : "172.17.141.1/24"
+  sdesc      : "internap"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "2"
+  ssid       : "WiFi-Leiden"
+  dhcp       : "10-250"
+  ns_ip      : "172.17.141.2/24"
+  ns_mac     : "00:15:6d:fc:4d:c0"
+  bridge_type: "NanoStation2"
+  status     : "up"
+
+iface_ue0_extra0:
+  comment    : "AP-binnen "
+  channel    : "6"
+  ssid       : "WiFi-Leiden"
+  type       : "eth"
+  ip         : "172.17.141.3/24"
+  ns_mac     : "00:15:6d:ad:d7:5b"
+  bridge_type: "NanoStation2"
+  status     : "up"
+
+iface_ue0_extra1:
+  comment    : "AP-binnen "
+  channel    : "6"
+  ssid       : "WiFi-Leiden"
+  type       : "eth"
+  ip         : "172.17.141.4/24"
+  ns_mac     : "00:27:22:16:77:b8"
+  bridge_type: "NanoStation2"
+  status     : "up"
+
+iface_ue0_extra2:
+  comment    : "AP-binnen "
+  channel    : "6"
+  ssid       : "WiFi-Leiden"
+  type       : "eth"
+  ip         : "172.17.141.5/24"
+  ns_mac     : "00:27:22:16:77:6c"
+  bridge_type: "NanoStation2"
+  status     : "up"
+
+iface_vr0:
+  comment    : "Link to SOM1"
+  ip         : "172.16.3.172/29"
+  sdesc      : "2SOM1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-z.som1.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  distance   : "3 km"
+  ns_ip      : "172.16.3.171/29"
+  ns_mac     : "00:15:6d:f2:38:c8"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "AP north east and APs Burcht via WDS"
+  ip         : "172.17.25.1/24"
+  sdesc      : "2AP-north"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "ap-WirelessLeiden-Stadhuis-no"
+  dhcp       : "10-250"
+  compass    : "no"
+  ns_ip      : "172.17.25.2/24"
+  ns_mac     : "00:15:6d:d4:f8:69"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+iface_vr1_extra0:
+  comment    : "AP-WDS Burcht "
+  channel    : "6"
+  ssid       : "WiFi-Leiden"
+  type       : "eth"
+  ip         : "172.17.25.3/24"
+  ns_mac     : "00:27:22:2c:4c:5b"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+iface_vr1_extra0:
+  comment    : "AP-WDS Burcht "
+  channel    : "6"
+  ssid       : "WiFi-Leiden"
+  type       : "eth"
+  ip         : "172.17.25.4/24"
+  ns_mac     : "00:15:6d:30:29:63"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+iface_vr2:
+  comment    : "A-link east via nanostation"
+  ip         : "172.16.3.209/29"
+  sdesc      : "2DeClercq"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "60"
+  ssid       : "il-o.stadhuis.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.3.210/29"
+  ns_mac     : "00:15:6d:bd:68:93"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2_alias0:
+  comment    : "Interlink naar victoria"
+  ip         : "172.16.17.193/29"
+  sdesc      : "2victoria"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr2_alias1:
+  comment    : "Interlink naar CeTIM1"
+  ip         : "172.16.4.169/29"
+  sdesc      : "2cetim1"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr3:
+  comment    : "Ethernet to interlink south east (Plantsoen)"
+  ip         : "172.16.5.113/29"
+  sdesc      : "2Plantsoen"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-zo.stadhuis.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  distance   : "0.5 km"
+  ns_ip      : "172.16.5.114/29"
+  ns_mac     : "00:15:6d:bd:8a:b3"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/Stenhuis1/wleiden.yaml
===================================================================
--- nodes/Stenhuis1/wleiden.yaml	(revision 13401)
+++ nodes/Stenhuis1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,92 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.25557"
+location  : "Jachthaven Stenhuis botenlift, Uiterweg 417a, 1431AM, Aalsmeer"
+longitude : "4.71750"
+masterip  : "172.17.94.1"
+monitoring_group: "westeinder"
+nodename  : "Stenhuis1"
+nodetype  : "Hybrid"
+portal_sponsor: "Jachthaven Stenhuis"
+portal_url: "http://www.jachtwerfstenhuis.nl/"
+rdnap_x   : 109273
+rdnap_y   : 474381
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ue0:
+  comment    : "Link naar Blauwe Beugel kabel 1"
+  ip         : "172.16.7.89/29"
+  sdesc      : "2blbglo"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-zo.stenhuis1.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.7.90/29"
+  ns_mac     : "dc:9f:db:e4:98:ad"
+  bridge_type: "NanostationM5"
+  status     : "down"
+
+
+iface_vr0:
+  comment    : "Link naar Watertoren3 kabel 6"
+  ip         : "172.16.6.156/29"
+  sdesc      : "2watertn"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-w.watertoren3.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.6.155/29"
+  ns_mac     : "dc:9f:db:e4:98:93"
+  bridge_type: "Nanostation M5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Accesspoint oost omni met bulletM2"
+  ip         : "172.17.94.1/24"
+  sdesc      : "ap-oost"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "11"
+  ssid       : "ap-jachthavenStenhuis-oost"
+  dhcp       : "10-250"
+  ns_ip      : "172.17.94.2/24"
+  ns_mac     : "dc:9f:db:0c:14:da"
+  bridge_type: "BulletM2"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Stenhuis2 kabel 5"
+  ip         : "172.16.7.148/29"
+  sdesc      : "2stenhuis2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-o.stenhuis2.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.7.147/29"
+  ns_mac     : "dc:9f:db:e2:ba:b7"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
Index: nodes/Stenhuis2/wleiden.yaml
===================================================================
--- nodes/Stenhuis2/wleiden.yaml	(revision 13401)
+++ nodes/Stenhuis2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,75 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.25562"
+location  : "Jachthaven Stenhuis haven, Uiterweg 417a, 1431AM, Aalsmeer"
+longitude : "4.71522"
+masterip  : "172.17.96.1"
+monitoring_group: "westeinder"
+nodename  : "Stenhuis2"
+nodetype  : "Hybrid"
+portal_sponsor: "Jachthaven Stenhuis"
+portal_url: "http://www.jachtwerfstenhuis.nl/"
+rdnap_x   : 109117
+rdnap_y   : 474389
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_vr0:
+  comment    : "Accesspoint jachthaven west omni met bullet2"
+  ip         : "172.17.96.1/24"
+  sdesc      : "2ap-w"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "ap-jachthavenStenhuis-west"
+  dhcp       : "10-250"
+  ns_ip      : "172.17.96.2/24"
+  ns_mac     : "00:27:22:66:6c:88"
+  bridge_type: "BulletM2"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Stenhuis1"
+  ip         : "172.16.7.145/29"
+  sdesc      : "2stenhuis1"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-o.stenhuis2.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.7.146/29"
+  ns_mac     : "dc:9f:db:e4:98:8f"
+  bridge_type: "Nanostation M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Blauwe Beugel"
+  ip         : "172.16.7.105/29"
+  sdesc      : "2blbglw"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "60"
+  ssid       : "il-zzo.stenhuis2.wleiden.net"
+  dhcp       : False
+  compass    : "zzo"
+  ns_ip      : "172.16.7.106/29"
+  ns_mac     : "dc:9f:db:2a:1d:8f"
+  bridge_type: "NanostationM5"
+  status     : "down"
+
+
Index: nodes/Suetanborgh/wleiden.yaml
===================================================================
--- nodes/Suetanborgh/wleiden.yaml	(revision 13401)
+++ nodes/Suetanborgh/wleiden.yaml	(revision 13401)
@@ -0,0 +1,51 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+ileiden   : True
+latitude  : "52.12207"
+location  : "Suetanborgh, Suetanpad 5, 2381 EE, Zoeterwoude"
+longitude : "4.49811"
+masterip  : "172.17.128.1"
+monitoring_group: "wzoeterwoude"
+nodename  : "Suetanborgh"
+nodetype  : "Hybrid"
+rdnap_x   : 94111
+rdnap_y   : 459689
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Antenne voor binnen"
+  ip         : "172.17.128.1/26"
+  sdesc      : "2binnen"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "ap-ZTW-Suetanborgh-Binnen"
+  dhcp       : "10-60"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link to ZTWDorpskerk"
+  ip         : "172.16.9.100/29"
+  sdesc      : "2dorpskerk"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-nno.ztwdorpskerk.wleiden.net"
+  channel    : 48
+  dhcp       : False
+  compass    : "zzw"
+  ns_ip      : "172.16.9.99/29"
+  ns_mac     : "00:27:22:52:f9:88"
+  bridge_type: "NanoStationM5"
+  status     : "up"
Index: nodes/TEYAkzoNobel1/wleiden.yaml
===================================================================
--- nodes/TEYAkzoNobel1/wleiden.yaml	(revision 13401)
+++ nodes/TEYAkzoNobel1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,136 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.20738"
+location  : "AkzoNobel, Sassenheim"
+longitude : "4.488716"
+masterip  : "172.17.126.1"
+monitoring_group: "Teylingen"
+nodename  : "TEYAkzoNobel1"
+nodetype  : "Hybrid"
+rdnap_x   : 93585
+rdnap_y   : 469188
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Access Point"
+  ip         : "172.17.126.1/24"
+  sdesc      : "Ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi Teylingen"
+  dhcp       : "10-250"
+  status     : "up"
+  
+
+iface_ue0:
+  comment    : "Interlink naar Kaag1 kabel 4"
+  ip         : "172.16.6.105/29"
+  sdesc      : "2kaag1"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-ono.teyakzonobel1.wleiden.net"
+  dhcp       : False
+  compass    : "ono"
+  ns_ip      : "172.16.6.106/29"
+  ns_mac     : "DC:9F:DB:F2:0D:FB"
+  bridge_type: "NanoBridgeM5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Interlink naar Bartholomeus kabel 3"
+  ip         : "172.16.9.36/29"
+  sdesc      : "2barth"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "124"
+  ssid       : "il-z.teybartholomeus.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.9.35"
+  ns_mac     : "DC:9F:DB:64:23:47"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+  
+  
+iface_vr1:
+  comment    : "Sassenheim, tijdelijk naar Kaag1 via switch kabel 2"
+  ip         : "172.16.9.249/29"
+  sdesc      : "2sassem"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "112"
+  ssid       : "il-no.teyakzonobel1.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.9.250"
+  ns_mac     : "DC:9F:DB:E4:98:96"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
+iface_vr1_alias0:
+  comment    : "Interlink naar St Victor via switch kabel 1"
+  ip         : "172.16.10.33/29"
+  sdesc      : "2stvictor"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "124"
+  ssid       : "il-n.teyakzonobel1.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.10.34"
+  ns_mac     : "DC:9F:DB:F2:0E:3F"
+  bridge_type: "NanoBridgeM5"
+  status     : "up"
+
+
+iface_vr1_alias1:
+  comment    : "Interlink naar Sportpark Elsgeest"
+  ip         : "172.16.10.17/29"
+  sdesc      : "2elsgeest"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr1_alias2:
+  comment    : "Interlink naar Katwijk via switch kabel 5"
+  ip         : "172.16.5.209/29"
+  sdesc      : "2katwijk"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-w.teyakzonobel1.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.5.210/29"
+  ns_mac     : "DC:9F:DB:2A:1C:F7"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+  
+iface_vr2:
+  comment    : "UTP naar AkzoNobel2"
+  ip         : "172.17.0.65/30"
+  sdesc      : "2akzo2"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
Index: nodes/TEYAkzoNobel2/wleiden.yaml
===================================================================
--- nodes/TEYAkzoNobel2/wleiden.yaml	(revision 13401)
+++ nodes/TEYAkzoNobel2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,94 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.20738"
+location  : "AkzoNobel, Sassenheim"
+longitude : "4.488716"
+masterip  : "172.17.80.1"
+monitoring_group: "Teylingen"
+nodename  : "TEYAkzoNobel2"
+nodetype  : "Hybrid"
+rdnap_x   : 93585
+rdnap_y   : 469188
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Access Point"
+  ip         : "172.17.80.1/24"
+  sdesc      : "Ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi Teylingen 2"
+  dhcp       : "10-250"
+  status     : "up"
+  
+
+iface_ue0:
+  comment    : "Interlink naar Noordwijk"
+  ip         : "172.16.10.1/29"
+  sdesc      : "2noordwijk"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "136"
+  ssid       : "il-zw.teyakzonobel2.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.10.2"
+  ns_mac     : "DC:9F:DB:F2:0F:6C"
+  bridge_type: "NanoBridgeM5"
+  status     : "up"
+  
+    
+iface_vr0:
+  comment    : "Interlink naar Joris de Witte"
+  ip         : "172.16.7.20/29"
+  sdesc      : "2jdw"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "64"
+  ssid       : "il-nno.jorisdewitte.wleiden.net"
+  dhcp       : False
+  compass    : "zzw"
+  ns_ip      : "172.16.7.19"
+  ns_mac     : "DC:9F:DB:2A:2C:ED"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Interlink naar Meelfabriek1"
+  ip         : "172.16.5.4/29"
+  sdesc      : "2meelfab"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-nw.meelfabriek1.wleiden.n"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.5.3"
+  ns_mac     : "DC:9F:DB:F2:0E:2D"
+  bridge_type: "NanoBridgeM5"
+  status     : "up"
+
+  
+iface_vr2:
+  comment    : "UTP naar AkzoNobel1"
+  ip         : "172.17.0.66/30"
+  sdesc      : "2akzo1"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
Index: nodes/TEYBartholomeus/wleiden.yaml
===================================================================
--- nodes/TEYBartholomeus/wleiden.yaml	(revision 13401)
+++ nodes/TEYBartholomeus/wleiden.yaml	(revision 13401)
@@ -0,0 +1,147 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.221419"
+location  : "St. Bartholomeuskerk, Herenstraat 27, 2215KE, Voorhout"
+longitude : "4.482612"
+masterip  : "172.17.124.1"
+monitoring_group: "teylingen"
+nodename  : "TEYBartholomeus"
+nodetype  : "Hybrid"
+portal_sponsor: "Gemeente Teylingen"
+portal_url: "http://rkvoorhout.nl/"
+rdnap_x   : 93188
+rdnap_y   : 470756
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Accesspoint 1 Coax - geen antenne"
+  ip         : "172.17.124.1/24"
+  sdesc      : "ap1"
+  mode       : "ap"
+  type       : "11a"
+  channel    : 36
+  ssid       : "WiFi Teylingen 2"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Accesspoints via switch"
+  ip         : "172.17.125.1/24"
+  sdesc      : "ap2"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "WiFi Teylingen"
+  dhcp       : "10-250"
+  compass    : "n"
+  ns_ip      : "172.17.125.2/24"
+  ns_mac     : "00:27:22:E2:53:E0"
+  bridge_type: "NanoStationM2"
+  status     : "up"
+
+  
+iface_ue0_extra0:
+  comment    : "Accesspoint West"
+  ip         : "172.17.125.3/24"
+  mode       : "client"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "11"
+  ssid       : "WiFi Teylingen"
+  compass    : "w"
+  ns_mac     : "dc:9f:db:36:1e:0d"
+  bridge_type: "NanoStationM2"
+  status     : "Up"
+
+
+iface_ue0_extra1:
+  comment    : "Accesspoint Zuid"
+  ip         : "172.17.125.4/24"
+  mode       : "client"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "WiFi Teylingen"
+  compass    : "z"
+  ns_mac     : "dc:9f:db:62:14:63"
+  bridge_type: "NanoStationM2"
+  status     : "Up"
+
+
+iface_ue0_extra2:
+  comment    : "Accesspoint Oost"
+  ip         : "172.17.125.5/24"
+  mode       : "client"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "11"
+  ssid       : "WiFi Teylingen"
+  compass    : "o"
+  ns_mac     : "dc:9f:db:62:13:3a"
+  bridge_type: "NanoStationM2"
+  status     : "Up"
+
+
+iface_vr0:
+  comment    : "Link naar Bestuurscentrum - kabel 1"
+  ip         : "172.16.7.84/29"
+  sdesc      : "2bestuur"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-zw.teybestuurscentrum.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.7.83/29"
+  ns_mac     : "00:27:22:10:fd:ed"
+  bridge_type: "Nanostation M5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar AKZO - kabel 8"
+  ip         : "172.16.9.33/29"
+  sdesc      : "2akzo"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "124"
+  ssid       : "il-z.bartholomeus.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.9.34/29"
+  ns_mac     : "24:A4:3C:0A:54:90"
+  bridge_type: "Nanostation M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar zuidwest (Homewizard 24:a4:3c:72:05:93) - kabel 9"
+  ip         : "172.16.9.41/29"
+  sdesc      : "2zw"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "64"
+  ssid       : "il-zw.bartholomeus.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.9.42/29"
+  ns_mac     : "00:27:22:10:fe:56"
+  bridge_type: "Nanostation M5"
+  status     : "up"
+  
+  
Index: nodes/TEYBestuurscentrum/wleiden.yaml
===================================================================
--- nodes/TEYBestuurscentrum/wleiden.yaml	(revision 13401)
+++ nodes/TEYBestuurscentrum/wleiden.yaml	(revision 13401)
@@ -0,0 +1,165 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+gateway   : "213.125.198.97"
+latitude  : "52.22313"
+location  : "Bestuurscentrum, Raadhuisplein 1, 2215MA, Voorhout"
+longitude : "4.48714"
+masterip  : "172.17.89.1"
+monitoring_group: "teylingen"
+nodename  : "TEYBestuurscentrum"
+nodetype  : "Hybrid"
+portal_sponsor: "Gemeente Teylingen"
+portal_url: "http://www.teylingen.nl"
+rdnap_x   : 93500
+rdnap_y   : 470942
+release   : "9.0-RELEASE"
+rdr_host  : "213.125.198.99"
+rdr_rules :
+- ['tcp', 9080, '172.17.0.41', 80]
+- ['tcp', 9081, '172.17.0.42', 554]
+- ['tcp', 9082, '172.17.0.43', 554]
+- ['tcp', 9083, '172.17.0.44', 80]
+- ['tcp', 9084, '172.17.0.43', 80]
+- ['tcp', 9085, '172.17.0.42', 80]
+- ['tcp', 9086, '172.17.0.45', 21]
+- ['tcp', 9087, '172.17.0.45', 3389]
+- ['tcp', 9090, '172.17.2.67', 80]
+- ['tcp', 9091, '172.16.9.237', 88]
+- ['tcp', 9092, '172.17.51.5', 80]
+- ['tcp', 9096, '172.17.13.66', 88]
+release   : "9.0-RELEASE"
+remote_access: "213.125.198.99:22"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: True
+service_proxy_ileiden: True
+service_proxy_normal: True
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Accesspoint oost"
+  ip         : "172.17.91.1/24"
+  sdesc      : "ap-0"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi Teylingen"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Accesspoint zuidwest kabel 1"
+  ip         : "172.17.89.1/24"
+  sdesc      : "2ap-zw"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "WiFi Teylingen 3"
+  dhcp       : "10-250"
+  compass    : "zw"
+  ns_ip      : "172.17.89.2/24"
+  ns_mac     : "dc:9f:db:36:1d:bc"
+  bridge_type: "NanoStationM2"
+  status     : "up"
+
+
+iface_ue1:
+  comment    : "Accesspoint noordwest kabel 2"
+  ip         : "172.17.90.1/24"
+  sdesc      : "2ap-nw"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "WiFi Teylingen 2"
+  dhcp       : "10-250"
+  compass    : "nw"
+  ns_ip      : "172.17.90.2/24"
+  ns_mac     : "dc:9f:db:36:1e:08"
+  bridge_type: "NanoStationM2"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "External Link kabel 8"
+  ip         : "213.125.198.99/29"
+  sdesc      : "2external"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Leeuwenhorst via switch kabel 6"
+  ip         : "172.16.6.140/29"
+  sdesc      : "2leeuwnh"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-z.leeuwenhorst.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.6.139/29"
+  ns_mac     : "dc:9f:db:e4:98:eb"
+  bridge_type: "Nanostation M5"
+  status     : "up"
+
+
+iface_vr1_alias0:
+  comment    : "richting oost niet in gebruik via switch kabel 5"
+  ip         : "172.16.7.73/29"
+  sdesc      : "2oost"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "104"
+  ssid       : "il-o.bestuurscentrum.wleiden.net"
+  dhcp       : False
+  compass    : "0"
+  ns_ip      : "172.16.7.74/29"
+  ns_mac     : "dc:9f:db:e4:98:4f"
+  bridge_type: "NanostationM5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Lijtweg via switch kabel 4"
+  ip         : "172.16.4.116/29"
+  sdesc      : "2z"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "56"
+  ssid       : "il-n.lijtweg1.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.4.115/29"
+  ns_mac     : "dc:9f:db:e4:98:ce"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
+iface_vr2_alias0:
+  comment    : "Link naar Bartholomeus via switch kabel 3"
+  ip         : "172.16.7.81/29"
+  sdesc      : "2zw"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-zw.teybestuurscentrum.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.7.82/29"
+  ns_mac     : "dc:9f:db:e4:99:cc"
+  bridge_type: "NanostationM5"
+  status     : "up"
+
+
Index: nodes/TEYOudeRaadhuis/wleiden.yaml
===================================================================
--- nodes/TEYOudeRaadhuis/wleiden.yaml	(revision 13401)
+++ nodes/TEYOudeRaadhuis/wleiden.yaml	(revision 13401)
@@ -0,0 +1,114 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.19686"
+location  : "Oude Raadhuis,Dorpsstraat 36, 2361BE, Warmond"
+longitude : "4.50368"
+masterip  : "172.17.85.1"
+monitoring_group: "teylingen"
+nodename  : "TEYOudeRaadhuis"
+nodetype  : "Hybrid"
+portal_sponsor: "Het Oude Raadhuis"
+portal_url: "http://hetouderaadhuisvanwarmond.nl/?page_id=550"
+rdnap_x   : 94594
+rdnap_y   : 468006
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor OudeRaadhuis-binnen"
+  ip         : "172.17.85.1/24"
+  sdesc      : "ap1"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi Teylingen 2"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar noordoost"
+  ip         : "172.16.9.73/29"
+  sdesc      : "2no"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-no.ouderaadhuis.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.9.74/29"
+  ns_mac     : "dc:9f:db:64:2f:05"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "A-link naar SOM1"
+  ip         : "172.16.9.60/29"
+  sdesc      : "2som1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-n.som1.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.9.59/29"
+  ns_mac     : "dc:9f:db:64:2f:7c"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar zuidoost label Groen"
+  ip         : "172.16.9.65/29"
+  sdesc      : "2zo"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-w.boterhuis.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.9.66/29"
+  ns_mac     : "dc:9f:db:64:2f:76"
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+iface_vr1_alias0:
+  comment    : "Link naar Boterhuis 172.16.6.180/29 - alleen winterlink "
+  ip         : "172.16.6.180/29"
+  sdesc      : "2boterhuis"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  status     : "up"
+
+  
+iface_vr2:
+  comment    : "Ap-OudeRaadhuis2 kabel zilver"
+  ip         : "172.17.123.1/24"
+  sdesc      : "ap2"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "WiFi Teylingen"
+  dhcp       : "10-250"
+  compass    : "n"
+  ns_ip      : "172.17.123.2/24"
+  ns_mac     : "dc:9f:db:3e:26:8b"
+  bridge_type: "NanoStationM2-Loco"
+  status     : "up"
+
+
Index: nodes/TEYStationSSH/wleiden.yaml
===================================================================
--- nodes/TEYStationSSH/wleiden.yaml	(revision 13401)
+++ nodes/TEYStationSSH/wleiden.yaml	(revision 13401)
@@ -0,0 +1,74 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "net4801"
+comment   : "None"
+latitude  : "52.21475"
+location  : "Sassenheim"
+longitude : "4.51649"
+masterip  : "172.17.120.1"
+monitoring_group: "teylingen"
+nodename  : "TEYStationSSH"
+nodetype  : "Hybrid"
+rdnap_x   : 95494
+rdnap_y   : 469986
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_sis0:
+  comment    : "Link oost - KWVdeKaag"
+  ip         : "172.16.4.20/29"
+  sdesc      : "2KWVdeKaag"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-w.kwvdekaag.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.4.19/29"
+  ns_mac     : "00:15:6d:70:54:4b"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_sis1:
+  comment    : "AP1 voor Station SSH"
+  ip         : "172.17.120.1/24"
+  sdesc      : "2ap1"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "ap-Tey-Station"
+  dhcp       : "10-250"
+  compass    : "n"
+  ns_ip      : "172.17.120.2/24"
+  ns_mac     : "dc:9f:db:3e:22:66"
+  bridge_type: "NanoStationM2-Loco"
+  status     : "up"
+
+
+iface_sis2:
+  comment    : "AP2 voor oost"
+  ip         : "172.17.38.1/24"
+  sdesc      : "2ap2"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "ap-Tey-Station-oost"
+  dhcp       : "10-250"
+  compass    : "o"
+  ns_ip      : "172.17.38.2/24"
+  ns_mac     : "dc:9f:db:3e:26:e4"
+  bridge_type: "NanoStationM2-Loco"
+  status     : "up"
+
+
Index: nodes/TUDelft/wleiden.yaml
===================================================================
--- nodes/TUDelft/wleiden.yaml	(revision 13401)
+++ nodes/TUDelft/wleiden.yaml	(revision 13401)
@@ -0,0 +1,106 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "51.99757"
+location  : "TUDelft-EWI,  Mekelweg 4, 2628CD, Delft"
+longitude : "4.37425"
+masterip  : "172.17.118.1"
+monitoring_group: "delft"
+nodename  : "TUDelft"
+nodetype  : "Hybrid"
+portal_sponsor: ""
+portal_url: ""
+rdnap_x   : 85436
+rdnap_y   : 445950
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor de buurt not configured (interferentievrees)"
+  ip         : "0.0.0.0/32"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Delft"
+  wlan_mac   : "30:14:4a:86:bb:b9"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar Ronald"
+  ip         : "172.16.7.217/29"
+  sdesc      : "2ronald"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-n.tudelft.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.7.218/29"
+  ns_mac     : "dc:9f:db:2e:0b:0b"
+  bridge_type: "NanoBridgeM5"
+  status     : "down"
+
+
+iface_vr0:
+  comment    : "Link naar StJan/Heineken"
+  ip         : "172.16.7.225/29"
+  sdesc      : "2stjan"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "48"
+  ssid       : "il-nno.tudelft.wleiden.net"
+  dhcp       : False
+  compass    : "nno"
+  ns_ip      : "172.16.7.226/29"
+  ns_mac     : "dc:9f:db:2e:0e:a3"
+  bridge_type: "NanoBridgeM5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Anthurium NanostationM5 DC:9F:DB:64:2E:BC"
+  ip         : "172.16.6.249/29"
+  sdesc      : "2anthurium"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-ono.tudelft.wleiden.net"
+  dhcp       : "252-254"
+  compass    : "n"
+  ns_ip      : "172.16.6.250/29"
+  ns_mac     : "dc:9f:db:64:2e:b8"
+  bridge_type: "NanostationM5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Zierikzee"
+  ip         : "172.16.7.233/29"
+  sdesc      : "2zierikzee"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "60"
+  ssid       : "il-zw.tudelft.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.7.234/29"
+  ns_mac     : "dc:9f:db:2e:0d:7a"
+  bridge_type: "NanoBridgeM5"
+  status     : "up"
+
+
Index: nodes/Thomas/wleiden.yaml
===================================================================
--- nodes/Thomas/wleiden.yaml	(revision 13401)
+++ nodes/Thomas/wleiden.yaml	(revision 13401)
@@ -0,0 +1,79 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.15601"
+location  : "Thomas, Rapenburg 118, 2311 GB, Leiden"
+longitude : "4.48864"
+masterip  : "172.17.48.1"
+monitoring_group: "wleiden"
+nodename  : "Thomas"
+nodetype  : "Hybrid"
+rdnap_x   : 93510
+rdnap_y   : 463474
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP voor de buurt"
+  ip         : "172.17.48.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:05:03:07"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet naar Thomas"
+  ip         : "172.17.0.25/29"
+  sdesc      : "eth"
+  type       : "eth"
+  dhcp       : "26-27"
+  status     : "down"
+
+
+iface_vr1:
+  comment    : "Link naar Vosko1"
+  ip         : "172.16.16.44/29"
+  sdesc      : "2vosko1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "64"
+  ssid       : "il-zw.vosko1.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.16.43/29"
+  ns_mac     : "00:15:6d:70:54:a0"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar IMI"
+  ip         : "172.16.16.49/29"
+  sdesc      : "2imi"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "112"
+  ssid       : "il-zw.thomas.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.16.50/29"
+  ns_mac     : "00:15:6d:70:52:5c"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/TulpEnZee/wleiden.yaml
===================================================================
--- nodes/TulpEnZee/wleiden.yaml	(revision 13401)
+++ nodes/TulpEnZee/wleiden.yaml	(revision 13401)
@@ -0,0 +1,97 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.27355"
+location  : "Bungalowpark Tulp en Zee, Randweg, 2204CW, Noordwijk"
+longitude : "4.47299"
+masterip  : "172.17.83.1"
+monitoring_group: "noordwijkerhout"
+nodename  : "TulpEnZee"
+nodetype  : "Hybrid"
+portal_sponsor: "Tulp en Zee"
+portal_url: "http://www.tulpenzee.nl/"
+rdnap_x   : 92604
+rdnap_y   : 476564
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap buurt MAC 30:14:4a:86:bb:c8"
+  ip         : "172.17.83.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "ap-TulpEnZee"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar De Wulp"
+  ip         : "172.16.7.25/29"
+  sdesc      : "2ono"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-ono.tulpenzee.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.7.26/29"
+  ns_mac     : "dc:9f:db:64:23:e7"
+  bridge_type: "NanostationM5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Lokaal netwerk"
+  ip         : "172.16.9.49/29"
+  sdesc      : "2external"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Zuid - Leeuwenhorst"
+  ip         : "172.16.7.36/29"
+  sdesc      : "2z"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-nw.leeuwenhorst.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.7.35/29"
+  ns_mac     : "dc:9f:db:f2:12:80"
+  bridge_type: "NanoBridge M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Accesspoint 5 GHz 2zuidoost"
+  ip         : "172.17.84.1/24"
+  sdesc      : "2zo"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "ap-TulpenZee-zo"
+  dhcp       : "10-250"
+  compass    : "zo"
+  ns_ip      : "172.17.84.2/24"
+  ns_mac     : "dc:9f:db:64:23:8b"
+  bridge_type: "NanostationM5"
+  status     : "up"
+
+
Index: nodes/UniGor1/wleiden.yaml
===================================================================
--- nodes/UniGor1/wleiden.yaml	(revision 13401)
+++ nodes/UniGor1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,79 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.16782"
+location  : "Gorleus Lab Universiteit Leiden, Einsteinweg 55, 2333 CC, Leiden"
+longitude : "4.45961"
+masterip  : "172.17.35.1"
+monitoring_group: "wleiden"
+nodename  : "UniGor1"
+nodetype  : "Hybrid"
+rdnap_x   : 91540
+rdnap_y   : 464813
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP Richting oost"
+  ip         : "172.17.35.1/24"
+  sdesc      : "ap-o"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Leiden-1"
+  wlan_mac   : "00:1b:b1:05:02:1f"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet naar server en Gorlaeus nodes - sunfire at 172.19.128.68"
+  ip         : "172.19.128.65/28"
+  sdesc      : "eth"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Cope - .190 temponary AnyWi webcam"
+  ip         : "172.16.3.185/29"
+  sdesc      : "2cope"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "128"
+  ssid       : "il-zo.unigor1.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.3.186/29"
+  ns_mac     : "00:15:6d:f2:38:a0"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Robijn3"
+  ip         : "172.16.5.217/29"
+  sdesc      : "2robijn3"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "104"
+  ssid       : "il-z.unigor1.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.5.218/29"
+  ns_mac     : "00:15:6d:f2:38:bd"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/UniGor2/wleiden.yaml
===================================================================
--- nodes/UniGor2/wleiden.yaml	(revision 13401)
+++ nodes/UniGor2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,89 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.16782"
+location  : "Gorleus Lab Universiteit Leiden, Einsteinweg 55, 2333 CC, Leiden"
+longitude : "4.45961"
+masterip  : "172.22.8.1"
+monitoring_group: "wleiden"
+nodename  : "UniGor2"
+nodetype  : "Hybrid"
+rdnap_x   : 91540
+rdnap_y   : 464813
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP Richting zuid"
+  ip         : "172.22.8.1/24"
+  sdesc      : "ap-zuid"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Leiden-2"
+  wlan_mac   : "00:1b:b1:05:02:ed"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet naar server en Gorlaeus nodes"
+  ip         : "172.19.128.66/28"
+  sdesc      : "eth"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "B-Link naar Brug"
+  ip         : "172.16.16.129/29"
+  sdesc      : "2brug"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "n-o.unigor.wleiden.net"
+  dhcp       : False
+  compass    : "e"
+  ns_ip      : "172.16.16.130/29"
+  ns_mac     : "00:15:6d:e8:e6:9b"
+  bridge_type: "Bullet2"
+  status     : "down"
+
+
+iface_vr1_alias0:
+  comment    : "B-Link naar AZC via bullet 2"
+  ip         : "172.16.0.165/30"
+  sdesc      : "2azc"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar DirkLos2"
+  ip         : "172.16.4.1/29"
+  sdesc      : "2DirkLos2"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "149"
+  ssid       : "il-o.unigor2.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.4.2/29"
+  ns_mac     : "00:15:6d:d0:14:75"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/UniGorN/wleiden.yaml
===================================================================
--- nodes/UniGorN/wleiden.yaml	(revision 13401)
+++ nodes/UniGorN/wleiden.yaml	(revision 13401)
@@ -0,0 +1,139 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.16825"
+location  : "Gorleus Lab Universiteit Leiden, Einsteinweg 55, 2333 CC, Leiden"
+longitude : "4.45966"
+masterip  : "172.19.135.1"
+monitoring_group: "wleiden"
+nodename  : "UniGorN"
+nodetype  : "Hybrid"
+rdnap_x   : 91544
+rdnap_y   : 464861
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP Oegstgeest richting N"
+  ip         : "172.19.135.1/24"
+  sdesc      : "n"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:0b:6b:34:5e:b6"
+  dhcp       : "10-250"
+  compass    : "n"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar Kaag2"
+  ip         : "172.16.17.73/29"
+  sdesc      : "2kaag2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-no.unigorn.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.17.74/29"
+  ns_mac     : "00:27:22:10:fd:f8"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_ue0_alias0:
+  comment    : "A Link naar Hofwijck"
+  ip         : "172.16.17.233/29"
+  sdesc      : "2hofwijck"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "A Link naar Aster"
+  ip         : "172.16.17.97/29"
+  sdesc      : "2Aster"
+  mode       : "station-wds"
+  type       : "eth"
+  channel    : "104"
+  ssid       : "il-o.unigorn.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.17.98/29"
+  ns_mac     : "00:15:6d:ea:f0:64"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr0_alias0:
+  comment    : "A Link naar Psycho"
+  ip         : "172.16.16.105/29"
+  sdesc      : "2Psycho"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr0_alias1:
+  comment    : "A Link naar KWVuurbaak"
+  ip         : "172.16.5.97/29"
+  sdesc      : "2vuurbaak"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Rustenborch"
+  ip         : "172.16.17.241/29"
+  sdesc      : "2rustenborch"
+  mode       : "station-wds"
+  type       : "eth"
+  channel    : "128"
+  ssid       : "il-n.unigorn.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.17.242/29"
+  ns_mac     : "00:15:6d:f2:37:fa"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1_alias0:
+  comment    : "Link via NS5 172.16.6.130 DC:9F:DB:64:2D:23 (nieuw) to LIACS 172.16.6.131 en .132"
+  ip         : "172.16.6.129/29"
+  sdesc      : "2liacs"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1_alias1:
+  comment    : "Link naar LIACS Sunny"
+  ip         : "172.16.4.45/30"
+  sdesc      : "2sunny"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "EthernetLink naar UniGor nodes"
+  ip         : "172.19.128.67/28"
+  sdesc      : "2unigor"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
Index: nodes/Victoria/wleiden.yaml
===================================================================
--- nodes/Victoria/wleiden.yaml	(revision 13401)
+++ nodes/Victoria/wleiden.yaml	(revision 13401)
@@ -0,0 +1,103 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.15569"
+location  : "Victoria Vastgoed, Gangetje 14, 2311ER, Leiden"
+longitude : "4.49327"
+masterip  : "172.17.140.1"
+monitoring_group: "wleiden"
+nodename  : "Victoria"
+nodetype  : "Hybrid"
+rdnap_x   : 93826
+rdnap_y   : 463434
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap"
+  ip         : "172.17.140.1/26"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:f1:74:70"
+  dhcp       : "10-60"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Ethernet naar lokaal AP met PoE"
+  ip         : "172.17.140.65/26"
+  sdesc      : "lokaalAP"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "6"
+  ssid       : "ap2-WirelessLeiden-Victoria"
+  dhcp       : "70-120"
+  ns_ip      : "172.17.140.66/26"
+  ns_mac     : ""
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "A-link naar Stadhuis"
+  ip         : "172.16.17.196/29"
+  sdesc      : "2stadhuis"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "44"
+  ssid       : "il-o.stadhuis.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.17.195/29"
+  ns_mac     : "00:15:6d:70:51:f2"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "A-link naar CeTIM2"
+  ip         : "172.16.17.204/29"
+  sdesc      : "2cetim2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-zw.cetim2.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.17.203/29"
+  ns_mac     : "00:15:6d:70:53:7f"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Nog vrij"
+  ip         : "172.16.17.209/29"
+  sdesc      : "2vrij"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "124"
+  ssid       : "il-zo.victoria.wleiden.net"
+  dhcp       : False
+  compass    : "se"
+  ns_ip      : "172.16.17.210/29"
+  ns_mac     : "00:15:6d:70:53:39"
+  bridge_type: "NanoStation5"
+  status     : "down"
+
+
Index: nodes/VisitorCentre/wleiden.yaml
===================================================================
--- nodes/VisitorCentre/wleiden.yaml	(revision 13401)
+++ nodes/VisitorCentre/wleiden.yaml	(revision 13401)
@@ -0,0 +1,127 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+gateway   : "213.125.99.233"
+latitude  : "52.16476"
+location  : "Visitor Centre Leiden, Stationsweg 26, 2312AT Leiden"
+longitude : "4.48388"
+masterip  : "172.17.87.1"
+monitoring_group: "wleiden"
+nodename  : "VisitorCentre"
+nodetype  : "Hybrid"
+portal_sponsor: "Visitor Centre Leiden"
+portal_url: "http://portal.leiden.nl/"
+rdnap_x   : 93196
+rdnap_y   : 464451
+rdr_host  : "213.125.99.237"
+rdr_rules :
+- ['tcp', 9080, '172.17.0.41', 80]
+- ['tcp', 9081, '172.17.0.42', 554]
+- ['tcp', 9082, '172.17.0.43', 554]
+- ['tcp', 9083, '172.17.0.44', 80]
+- ['tcp', 9084, '172.17.0.43', 80]
+- ['tcp', 9085, '172.17.0.42', 80]
+- ['tcp', 9086, '172.17.0.45', 21]
+- ['tcp', 9087, '172.17.0.45', 3389]
+- ['tcp', 9090, '172.17.2.67', 80]
+- ['tcp', 9091, '172.16.9.237', 88]
+- ['tcp', 9092, '172.17.51.5', 80]
+- ['tcp', 9093, '172.16.3.142', 8080]
+- ['tcp', 9094, '172.17.20.5', 80]
+- ['tcp', 9095, '172.17.20.5', 554]
+- ['tcp', 9096, '172.17.13.66', 88]
+- ['tcp', 9097, '172.16.3.190', 8080]
+- ['tcp', 9098, '172.16.3.134', 8080]
+- ['tcp', 43389, '172.17.0.45', 3389]
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: True
+service_proxy_ileiden: True
+service_proxy_normal: True
+status    : "down"
+
+
+iface_ath0:
+  comment    : "PA4040 voor Stationsweg"
+  ip         : "172.17.88.1/24"
+  sdesc      : "2apzo"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:00:ec:94"
+  dhcp       : "10-240"
+  status     : "up"
+
+iface_ue0:
+  comment    : "Ap-zuidwest sectorantenne 120 graden kabel 3"
+  ip         : "172.17.87.1/24"
+  sdesc      : "2apzw"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "11"
+  ssid       : "WiFi-Leiden"
+  dhcp       : "10-240"
+  ns_ip      : "172.17.87.2/24"
+  ns_mac     : "dc:9f:db:0c:30:2a"
+  bridge_type: "RocketM2"
+  status     : "up"
+
+iface_vr0:
+  comment    : "Link naar DeKijker"
+  ip         : "172.16.5.188/29"
+  sdesc      : "2kijker"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : ""
+  ssid       : "il-zzo.dekijker.wleiden.net"
+  dhcp       : False
+  compass    : "nnw"
+  ns_ip      : "172.16.5.187"
+  ns_mac     : ""
+  bridge_type: "NanoStation5M"
+  status     : "up"
+
+iface_vr0_alias0:
+  comment    : "Uplink"
+  ip         : "213.125.99.237/29"
+  sdesc      : "uplink"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr1:
+  comment    : "Link naar Cope kabel 1"
+  ip         : "172.16.7.57/29"
+  sdesc      : "2zuid"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "136"
+  ssid       : "il-z.visitorcentre2.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.7.58/29"
+  ns_mac     : "dc:9f:db:2e:0a:a6"
+  bridge_type: "NanoBridgeM5"
+  status     : "up"
+
+iface_vr2:
+  comment    : "Link naar Oost kabel 2"
+  ip         : "172.16.6.161/29"
+  sdesc      : "2oost"
+  mode       : "ap-wds"
+  type       : "eth"
+  channel    : "52"
+  ssid       : "il-o.visitorcentre2.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.6.162/29"
+  ns_mac     : "dc:9f:db:2e:0b:01"
+  bridge_type: "NanoBridgeM5"
+  status     : "up"
+
+
Index: nodes/Vosko1/wleiden.yaml
===================================================================
--- nodes/Vosko1/wleiden.yaml	(revision 13401)
+++ nodes/Vosko1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,100 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.15765"
+location  : "Pieterskerk, Kloksteeg 16, 2311 SL, Leiden"
+longitude : "4.48786"
+masterip  : "172.17.174.1"
+monitoring_group: "wleiden"
+nodename  : "Vosko1"
+nodetype  : "Hybrid"
+rdnap_x   : 93459
+rdnap_y   : 463657
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap west"
+  ip         : "172.17.174.1/24"
+  sdesc      : "ap-w"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Leiden-1"
+  wlan_mac   : "00:0b:6b:34:61:90"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Lokaal ethernet"
+  ip         : "172.17.175.71/28"
+  sdesc      : "ethernet"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "A-link naar Grip"
+  ip         : "172.16.16.57/29"
+  sdesc      : "2grip"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "64"
+  ssid       : "il-zw.vosko1.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.16.58/29"
+  ns_mac     : "00:15:6d:ec:83:7d"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1_alias0:
+  comment    : "A-link naar Thomas"
+  ip         : "172.16.16.41/29"
+  sdesc      : "2thomas"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Ethernet/PoE naar AP in kerk"
+  ip         : "172.17.26.1/24"
+  sdesc      : "2kerk"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "WiFi-Leiden-Pieterskerk"
+  dhcp       : "10-250"
+  ns_ip      : "172.17.26.2/24"
+  ns_mac     : "00:27:22:e2:52:50"
+  bridge_type: "NanoStation M2"
+  status     : "up"
+
+
+iface_vr2_alias0:
+  comment    : "B-link naar Vosko4"
+  ip         : "172.17.0.17/30"
+  sdesc      : "2vosko4"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
Index: nodes/Vosko2/wleiden.yaml
===================================================================
--- nodes/Vosko2/wleiden.yaml	(revision 13401)
+++ nodes/Vosko2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,127 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.15765"
+location  : "Pieterskerk, Kloksteeg 16, 2311 SL, Leiden"
+longitude : "4.48786"
+masterip  : "172.17.93.1"
+monitoring_group: "wleiden"
+nodename  : "Vosko2"
+nodetype  : "Hybrid"
+rdnap_x   : 93459
+rdnap_y   : 463657
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap noord"
+  ip         : "172.17.93.1/24"
+  sdesc      : "ap-n"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Leiden-2"
+  wlan_mac   : "00:0b:6b:34:61:d9"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar Hortus"
+  ip         : "172.16.4.137/29"
+  sdesc      : "2hortus"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-w2.vosko2.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.4.138/29"
+  ns_mac     : "00:27:22:8a:3d:94"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar Rabo1"
+  ip         : "172.16.4.12/29"
+  sdesc      : "2visitorc2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "136"
+  ssid       : "il-z.rabo1.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.4.11"
+  ns_mac     : "00:15:6d:f2:35:7d"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Interlink w (Robijn)"
+  ip         : "172.16.4.81/29"
+  sdesc      : "2Robijn"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-w.vosko2.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.4.82/29"
+  ns_mac     : "00:15:6d:f6:be:f7"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1_alias0:
+  comment    : "Interlink w (Huub)"
+  ip         : "172.16.4.121/29"
+  sdesc      : "2huub"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1_alias1:
+  comment    : "Interlink w (BCSte)"
+  ip         : "172.16.3.155/29"
+  sdesc      : "2bcste"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1_alias2:
+  comment    : "Link naar Zwaluwak"
+  ip         : "172.16.4.33/29"
+  sdesc      : "2zwaluwak"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Lokaal ethernet"
+  ip         : "172.17.175.72/28"
+  sdesc      : "ethernet"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
Index: nodes/Vosko3/wleiden.yaml
===================================================================
--- nodes/Vosko3/wleiden.yaml	(revision 13401)
+++ nodes/Vosko3/wleiden.yaml	(revision 13401)
@@ -0,0 +1,118 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.15765"
+location  : "Pieterskerk, Kloksteeg 16, 2311 SL, Leiden"
+longitude : "4.48786"
+masterip  : "172.17.176.1"
+monitoring_group: "wleiden"
+nodename  : "Vosko3"
+nodetype  : "Hybrid"
+rdnap_x   : 93459
+rdnap_y   : 463657
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap zuidoost"
+  ip         : "172.17.176.1/26"
+  sdesc      : "ap-zo"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Leiden-Vosko3"
+  wlan_mac   : "00:80:48:54:bb:57"
+  dhcp       : "10-60"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Lokaal ethernet"
+  ip         : "172.17.175.73/28"
+  sdesc      : "ethernet"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "A-link to Stadhuis via Nanostation5"
+  ip         : "172.16.5.65/29"
+  sdesc      : "2stadhuis"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-o.vosko3.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.5.66/29"
+  ns_mac     : "00:15:6d:bd:67:fe"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Ethernet to interlink south-east (Plantsoen)"
+  ip         : "172.16.5.89/29"
+  sdesc      : "2Plantsoen"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "92"
+  ssid       : "il-zo.vosko3.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.5.90/29"
+  ns_mac     : "00:15:6d:bd:67:ff"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "A-link to DirkLos1 via Nanostation5"
+  ip         : "172.16.4.73/29"
+  sdesc      : "2DirkLos1"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-wnw.vosko3.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.4.74/29"
+  ns_mac     : "00:15:6d:bd:68:9b"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2_alias0:
+  comment    : "A-link to geluidsnet2"
+  ip         : "172.16.4.201/29"
+  sdesc      : "2geluidsnet2"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr2_alias1:
+  comment    : "A-link to Webster"
+  ip         : "172.16.4.249/29"
+  sdesc      : "2webster"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  dhcp       : False
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
Index: nodes/Vosko4/wleiden.yaml
===================================================================
--- nodes/Vosko4/wleiden.yaml	(revision 13401)
+++ nodes/Vosko4/wleiden.yaml	(revision 13401)
@@ -0,0 +1,58 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "VPN-server voor video-upload"
+gateway   : "132.229.125.1"
+latitude  : "52.15765"
+location  : "Pieterskerk, Kloksteeg 16, 2311 SL, Leiden"
+longitude : "4.48786"
+masterip  : "172.17.0.18"
+monitoring_group: "wleiden"
+nodename  : "Vosko4"
+nodetype  : "Hybrid"
+rdnap_x   : 93459
+rdnap_y   : 463657
+release   : "9.0-RELEASE"
+service_accesspoint: False
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+iface_vr0:
+  comment    : "External Link"
+  ip         : "132.229.125.70/24"
+  sdesc      : "2external"
+  type       : "eth"
+  dhcp       : False
+  status     : "down"
+
+
+iface_vr1:
+  comment    : "B-link naar Vosko1 via Nanostation2M"
+  ip         : "172.17.0.18/30"
+  sdesc      : "2vosko1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "2"
+  ssid       : "WiFi-Leiden-Pieterskerk"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.17.26.3/24"
+  ns_mac     : "00:27:22:e2:51:eb"
+  bridge_type: "NanoStationM2"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "External Link"
+  ip         : "192.168.2.111/24"
+  sdesc      : "2localexternal"
+  type       : "eth"
+  dhcp       : False
+  status     : "down"
+
+
Index: nodes/WBRotary/wleiden.yaml
===================================================================
--- nodes/WBRotary/wleiden.yaml	(revision 13401)
+++ nodes/WBRotary/wleiden.yaml	(revision 13401)
@@ -0,0 +1,115 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+ileiden   : False
+latitude  : "52.16707"
+location  : "NH Kerk, Comriekade 7, 2481 AD, Woubrugge"
+longitude : "4.63817"
+masterip  : "172.25.52.1"
+monitoring_group: "wleiden"
+nodename  : "WBRotary"
+nodetype  : "Hybrid"
+rdnap_x   : 103755
+rdnap_y   : 464588
+release   : "9.0-RELEASE"
+remote_access: ""
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap voor de buurt"
+  ip         : "172.25.52.1/24"
+  sdesc      : "apnz"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Woubrugge"
+  wlan_mac   : "00:1b:b1:05:01:1a"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar Zoeterwoude Rijndijk"
+  ip         : "172.16.18.25/29"
+  sdesc      : "2ztw"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-wzw.wbrotary.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.18.26/29"
+  ns_mac     : "00:15:6d:8e:dc:be"
+  bridge_type: "Bullet M5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ap voor de buurt"
+  ip         : "172.25.56.1/24"
+  sdesc      : "apwo"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "11"
+  ssid       : "WiFi-Woubrugge"
+  dhcp       : "10-250"
+  ns_ip      : "172.25.56.2/24"
+  ns_mac     : "00:15:6d:4c:c2:ec"
+  ns_type    : "BulletM2"
+  bridge_type: "BulletM2"
+  status     : "up"
+
+
+iface_vr0_extra0:
+  comment    : "repeater Disgenoten-2"
+  ip         : "172.25.56.4/24"
+  mode       : "repeater"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ns_mac     : "dc:9f:db:36:1d:ef"
+  bridge_type: "NanoStation2"
+  status     : "up"
+
+iface_vr1:
+  comment    : "Link naar Henk via BulletM5"
+  ip         : "172.16.6.73/29"
+  sdesc      : "2henk"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-n.wbrotary.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.6.74/29"
+  ns_mac     : "00:15:6D:8E:DA:99 "
+  bridge_type: "BulletM5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Graficall, Leiderdorp"
+  ip         : "172.16.18.44/29"
+  sdesc      : "2graficall"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-o.graficall.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.18.43/29"
+  ns_mac     : "00:27:22:10:34:c6"
+  bridge_type: "Bullet M5"
+  status     : "down"
+
Index: nodes/WP/ProxyWP/wleiden.yaml
===================================================================
--- nodes/WP/ProxyWP/wleiden.yaml	(revision 13401)
+++ nodes/WP/ProxyWP/wleiden.yaml	(revision 13401)
@@ -0,0 +1,41 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "net45xx"
+comment   : " verbonden met glasvezel gateway 192.168.0.1 nameservers: 217.149.192.6 en 217.149.196.6 "
+externalif: "sis0"
+ileiden   : False
+internalif: "sis1"
+internalroute: "172.19.168.65"
+latitude  : "52.17294"
+location  : " Openbare Basisschool Woutertje Pieterse, Houtlaan 60, 2334 CL, Leiden"
+longitude : "4.47978"
+masterip  : "172.19.168.66"
+monitoring_group: "wleiden"
+nodename  : "WP"
+nodetype  : "Proxy"
+proxyid   : 5
+rdnap_x   : 92927
+rdnap_y   : 465365
+release   : "8.2-RELEASE"
+status    : "up"
+
+
+iface_sis0:
+  comment    : "Link naar router"
+  ip         : "192.168.0.16/24"
+  sdesc      : "uplink"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_sis1:
+  comment    : "Link naar NodeWP"
+  ip         : "172.19.168.66/30"
+  sdesc      : "downlink"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
Index: nodes/WP/wleiden.yaml
===================================================================
--- nodes/WP/wleiden.yaml	(revision 13401)
+++ nodes/WP/wleiden.yaml	(revision 13401)
@@ -0,0 +1,84 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "net45xx"
+comment   : "None"
+latitude  : "52.17294"
+location  : " Openbare Basisschool Woutertje Pieterse, Houtlaan 60, 2334 CL, Leiden"
+longitude : "4.47978"
+masterip  : "172.19.168.1"
+monitoring_group: "wleiden"
+nodename  : "WP"
+nodetype  : "Hybrid"
+rdnap_x   : 92927
+rdnap_y   : 465365
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_sis0:
+  comment    : "Ethernet naar proxy5"
+  ip         : "172.19.168.65/30"
+  sdesc      : "2proxy5"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_sis1:
+  comment    : "A-link zuid - psycho"
+  ip         : "172.16.16.124/29"
+  sdesc      : "2psycho"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-n.psycho.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.16.123/29"
+  ns_mac     : "00:15:6d:70:54:6d"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_wi0:
+  comment    : "Omni voor de buurt"
+  ip         : "172.19.168.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "ap-WirelessLeiden-WoutertjeP"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_wi1:
+  comment    : "Link naar AZC"
+  ip         : "172.16.2.10/29"
+  sdesc      : "2azc"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "il-no.azc.wleiden.net"
+  dhcp       : False
+  compass    : "ne"
+  status     : "down"
+
+
+iface_wi1_alias0:
+  comment    : "Link naar AZC"
+  ip         : "172.16.2.114/30"
+  sdesc      : "2azcsub30"
+  mode       : "ap"
+  type       : "11g"
+  dhcp       : False
+  status     : "up"
+
+
Index: nodes/Watertoren1/authorized_keys
===================================================================
--- nodes/Watertoren1/authorized_keys	(revision 13401)
+++ nodes/Watertoren1/authorized_keys	(revision 13401)
@@ -0,0 +1,3 @@
+#
+# Wireless Amsterdam (webmind)
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCwfZdG+p9oj+D93Qa8s+fIu2ODbWODiHp6NfLSvSRNo8PVfQfyc8gPBlofFBRPSHAN5vf2OJBWs3+76KpejISgLn+whlZc/yzqLt1mnRR142ocuRu8bhYBGHHUrh3tFTBOL/pYTyzlGyGXcjNadt95TDvJ8H+MS9B8OZ6EPPHC5zgsnT8hrk92xAbkuoskTvih6PJcSHbtoSL9rU4DFzzNAgWp0mncRgN6XKEaJVMQhWS/J5+44YFGndiX/3YlkC8a8GLEQQkWtu1eQiFWxFWmkAtl7Ch83TTXQdW+kRcCu1qb0fg03HFI4/ekG4h+H5EJn5nOHDyt+WmSKgoNGxfT8eRwLeHET9UM8+TOPEcRbzePIeC+rkz6Qsxey2s0/BZfx08fPovZzsZkFrlEKzkEyJWRjBwfq1GKvAXXBLxnNEB4OlVvPwZJmpyT9LFutssR6q4aYGM3P5Ky4oG5AHhsBkner9Lfi6GsozP54fI12sX4ja69rUbADIF6zlMe7FbBXjuN3CuC+7BpyHG8c/quTa8jpnxn7Q0yUmtJ0Ka4Kh5W1p4rNFH1wkBF5YGgr1Oq/g99cmu947YYZK/Nq11fYpRcu/bJqmWmYMVFGxiVgg82NWS9cuSY9LVnfTxkmVXO8+jNrVN0AcWraMmXtPxl4hAWdfVVos+lGmN8ZPcGmQ== webmind@interface
Index: nodes/Watertoren1/wleiden.yaml
===================================================================
--- nodes/Watertoren1/wleiden.yaml	(revision 13401)
+++ nodes/Watertoren1/wleiden.yaml	(revision 13401)
@@ -0,0 +1,106 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+gateway   : "92.66.227.161"
+ileiden   : True
+latitude  : "52.25493"
+location  : "Watertoren, Kudelstaartseweg 16,1431 GA, Aalsmeer"
+longitude : "4.75742"
+masterip  : "172.17.9.1"
+monitoring_group: "wleiden"
+nodename  : "Watertoren1"
+nodetype  : "Hybrid"
+rdnap_x   : 111998
+rdnap_y   : 474286
+rdr_host  : "92.66.227.163"
+rdr_rules :
+- ['tcp', 9080, '172.17.0.41', 80]
+- ['tcp', 9081, '172.17.0.42', 554]
+- ['tcp', 9082, '172.17.0.43', 554]
+- ['tcp', 9083, '172.17.0.44', 80]
+- ['tcp', 9092, '172.17.51.5', 80]
+- ['tcp', 9096, '172.17.13.66', 88]
+- ['tcp', 43389, '172.17.0.45', 3389]
+release   : "9.0-RELEASE"
+remote_access: "92.66.227.163:22"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "OMNI voor Wifi op de westeinder (Mast3:Pos2)"
+  ip         : "172.17.9.1/26"
+  sdesc      : "ap-omni"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-Westeinder-Watertoren1"
+  wlan_mac   : "00:0b:6b:85:64:78"
+  dhcp       : "20-60"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet/ Switchport: 3"
+  ip         : "172.25.90.67/29"
+  sdesc      : "uplink"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr0_alias0:
+  comment    : "Uplink"
+  ip         : "92.66.227.163/29"
+  sdesc      : "uplink"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Nanostation M5 naar Amsterdam (Mast1:Pos2)"
+  ip         : "172.16.16.89/29"
+  sdesc      : "2ams"
+  mode       : "ap-wds"
+  type       : "eth"
+  channel    : "44"
+  ssid       : "il-nno.watertoren1.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.16.90/29"
+  ns_mac     : "dc:9f:db:2a:1d:17"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1_alias_0:
+  comment    : "Network TechInc"
+  ip         : "172.17.92.1/24"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Webcams ips 41 t/m 44 PC 37 NS Aalsmeer 35"
+  ip         : "172.17.0.33/28"
+  sdesc      : "2webcams"
+  mode       : "ap-wds"
+  type       : "eth"
+  channel    : "106"
+  ssid       : "il-n.watertoren1.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.17.0.34/28"
+  ns_mac     : "DC:9F:DB:2B:2F:B9"
+  bridge_type: "NanoStation5M"
+  status     : "up"
+
+
Index: nodes/Watertoren2/wleiden.yaml
===================================================================
--- nodes/Watertoren2/wleiden.yaml	(revision 13401)
+++ nodes/Watertoren2/wleiden.yaml	(revision 13401)
@@ -0,0 +1,106 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+gateway   : "92.66.227.161"
+ileiden   : True
+latitude  : "52.25493"
+location  : "Watertoren, Kudelstaartseweg 16,1431 GA, Aalsmeer"
+longitude : "4.75742"
+masterip  : "172.17.10.1"
+monitoring_group: "wleiden"
+nodename  : "Watertoren2"
+nodetype  : "Hybrid"
+rdnap_x   : 111998
+rdnap_y   : 474286
+release   : "9.0-RELEASE"
+remote_access: "92.66.227.162:22"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "OMNI voor Wifi op de westeinder (MastX:PostX)"
+  ip         : "172.17.10.1/26"
+  sdesc      : "ap-omni"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Westeinder-Watertoren2"
+  wlan_mac   : "00:0b:6b:85:66:bb"
+  dhcp       : "20-60"
+  status     : "up"
+
+iface_ue0:
+  comment    : "Link naar Kaag2 via NSM5 (Mast2:Pos4)"
+  ip         : "172.16.9.169/29"
+  sdesc      : "2kaag2"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "60"
+  ssid       : "il-zw.watertoren2.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.9.170/29"
+  ns_mac     : "dc:9f:db:2a:27:9c"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet / Switchport: 2"
+  ip         : "172.25.90.65/29"
+  sdesc      : "2proxy"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr0_alias0:
+  comment    : "Uplink"
+  ip         : "92.66.227.162/29"
+  sdesc      : "uplink"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Unused (Mast3:Pos2)"
+  ip         : "172.16.16.100/29"
+  sdesc      : "2kempersextra"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-zw2.watertoren2.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.16.99/29"
+  ns_mac     : "00:15:6d:ec:81:f3"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Nanostation naar Drijfhuis (Mast1:Pos3)"
+  ip         : "172.16.16.33/29"
+  sdesc      : "2drijfhuis"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-nw-2.watertoren2.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.16.34/29"
+  ns_mac     : "00:15:6d:70:4d:a5"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
Index: nodes/Watertoren3/wleiden.yaml
===================================================================
--- nodes/Watertoren3/wleiden.yaml	(revision 13401)
+++ nodes/Watertoren3/wleiden.yaml	(revision 13401)
@@ -0,0 +1,110 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+gateway   : "92.66.227.161"
+ileiden   : True
+latitude  : "52.25493"
+location  : "Watertoren, Kudelstaartseweg 16,1431 GA, Aalsmeer"
+longitude : "4.75742"
+masterip  : "172.17.14.1"
+monitoring_group: "wleiden"
+nodename  : "Watertoren3"
+nodetype  : "Hybrid"
+rdnap_x   : 111998
+rdnap_y   : 474286
+release   : "9.0-RELEASE"
+remote_access: "92.66.227.164:22"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ue0:
+  comment    : "Nanostation naar Kudelstaart (Mast3:Pos3)"
+  ip         : "172.16.16.145/29"
+  sdesc      : "2kudelstaart"
+  mode       : "ap-wds"
+  type       : "eth"
+  channel    : "36"
+  ssid       : "il-z.watertoren3.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.16.146/29"
+  ns_mac     : "00:15:6d:70:52:5e"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Ethernet / Switchport: 4"
+  ip         : "172.25.90.68/29"
+  sdesc      : "uplink"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr0_alias0:
+  comment    : "Uplink"
+  ip         : "92.66.227.164/29"
+  sdesc      : "uplink"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Kempers il-no2 (Mast2:Post3)"
+  ip         : "172.16.16.236/29"
+  sdesc      : "2kempers2"
+  mode       : "ap-wds"
+  type       : "eth"
+  channel    : "52"
+  ssid       : "il-zw.watertoren3.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.16.235/29"
+  ns_mac     : "00:15:6d:f2:42:f3"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Nanostation5 naar RecPark (Mast2:Post2)"
+  ip         : "172.16.16.73/29"
+  sdesc      : "2recpark"
+  mode       : "ap-wds"
+  type       : "eth"
+  channel    : "140"
+  ssid       : "il-w.watertoren3.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.16.74/29"
+  ns_mac     : "00:15:6d:70:52:52"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2_alias0:
+  comment    : "Nanostation5 naar Stenhuis1"
+  ip         : "172.16.6.153/29"
+  sdesc      : "2stenhuis1"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr2_alias1:
+  comment    : "Nanostation5 naar Rekpark214a"
+  ip         : "172.16.3.241/29"
+  sdesc      : "2rekpark214a"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+
Index: nodes/Webster/wleiden.yaml
===================================================================
--- nodes/Webster/wleiden.yaml	(revision 13401)
+++ nodes/Webster/wleiden.yaml	(revision 13401)
@@ -0,0 +1,102 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.16032"
+location  : "Webster University, Galgewater 1, 2311 VZ, Leiden"
+longitude : "4.48344"
+masterip  : "172.17.15.1"
+monitoring_group: "wleiden"
+nodename  : "Webster"
+nodetype  : "Hybrid"
+rdnap_x   : 93160
+rdnap_y   : 463958
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap"
+  ip         : "172.17.15.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "90:a4:de:8b:e3:22"
+  dhcp       : "10-100"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Ap Beestenmarkt via nano2M"
+  ip         : "172.17.17.1/24"
+  sdesc      : "ap1"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "10"
+  ssid       : "WiFi-Leiden-1"
+  dhcp       : "10-100"
+  ns_ip      : "172.17.17.2/24"
+  ns_mac     : "00:27:22:80:5a:b4"
+  bridge_type: "NanoStation M2"
+  status     : "up"
+
+iface_vr0:
+  comment    : "Link naar Geluidsnet2"
+  ip         : "172.16.4.196/29"
+  sdesc      : "2geluidsnet2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-z.geluidsnet2.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.4.195/29"
+  ns_mac     : "00:15:6d:f2:37:c5"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar vosko3"
+  ip         : "172.16.4.252/29"
+  sdesc      : "2vosko3"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-wnw.vosko3.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.4.251/29"
+  ns_mac     : "00:15:6d:70:53:6c"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar LucasN"
+  ip         : "172.16.4.180/29"
+  sdesc      : "2lucasn"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-zw.lucasn.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.4.179/29"
+  ns_mac     : "00:27:22:10:f5:b4"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
Index: nodes/Wulp/wleiden.yaml
===================================================================
--- nodes/Wulp/wleiden.yaml	(revision 13401)
+++ nodes/Wulp/wleiden.yaml	(revision 13401)
@@ -0,0 +1,101 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.27365"
+location  : "Camping de Wulp, Kraaierslaan 25, 2204AN, Noordwijk"
+longitude : "4.47762"
+masterip  : "172.17.109.1"
+monitoring_group: "noordwijkerhout"
+nodename  : "Wulp"
+nodetype  : "Hybrid"
+portal_sponsor: "Camping de Wulp"
+portal_url: "http://www.dewulp.nl/"
+rdnap_x   : 92920
+rdnap_y   : 476571
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap binnen"
+  ip         : "172.17.109.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "WiFi-DeWulp-binnen"
+  wlan_mac   : "90:a4:de:8b:e3:19"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar TulpenZee"
+  ip         : "172.16.7.28/29"
+  sdesc      : "2tulpenzee"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-ono.tulpenzee.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.7.27/29"
+  ns_mac     : "00:27:22:10:F5:9F"
+  bridge_type: "NanostationM5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar Zuid - Leeuwenhorst"
+  ip         : "172.16.7.52/29"
+  sdesc      : "2zzw"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-nw.leeuwenhorst.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.7.51/29"
+  ns_mac     : "dc:9f:db:2e:0b:10"
+  bridge_type: "NanoBridge M5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Accesspoint 2 westzijde"
+  ip         : "172.17.110.1/24"
+  sdesc      : "2aps"
+  mode       : "ap"
+  type       : "eth"
+  dhcp       : "20-250"
+  ssid       : "WiFi-DeWulp-west"
+  ns_ip      : "172.17.110.12/24"
+  ns_mac     : "dc:9f:db:5a:9d:37"
+  bridge_type: "NanostationM2"
+  status     : "down"
+
+
+iface_vr2:
+  comment    : "Accesspoint 3 oostzijde"
+  ip         : "172.17.111.1/24"
+  sdesc      : "ap-Oost"
+  mode       : "ap-wds"
+  type       : "eth"
+  channel    : "140"
+  ssid       : "WiFis-DeWulp-oost"
+  ns_ip      : "172.17.111.2/24"
+  ns_mac     : "24:a4:3c:70:48:fe"
+  bridge_type: "NanostationM5"
+  dhcp       : "20-250"
+  status     : "down"
+
+
Index: nodes/ZTWDorpskerk/wleiden.yaml
===================================================================
--- nodes/ZTWDorpskerk/wleiden.yaml	(revision 13401)
+++ nodes/ZTWDorpskerk/wleiden.yaml	(revision 13401)
@@ -0,0 +1,107 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+latitude  : "52.12129"
+location  : "Dorpskerk, Dorpsstraat 17,  2381 EK Zoeterwoude"
+longitude : "4.49724"
+masterip  : "172.17.61.1"
+monitoring_group: "wleiden"
+nodename  : "ZTWDorpskerk"
+nodetype  : "Hybrid"
+rdnap_x   : 94051
+rdnap_y   : 459604
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Omni voor Binnen"
+  ip         : "172.17.61.1/24"
+  sdesc      : "2buurt"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "ap-ZTW-Dorpskerk-Binnen"
+  dhcp       : "10-240"
+  status     : "up"
+
+
+iface_ue1:
+  comment    : "Link naar StJan"
+  ip         : "172.16.5.108/29"
+  sdesc      : "2StJan"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "108"
+  ssid       : "il-nw.stjan.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.5.107/29"
+  ns_mac     : "00:27:22:8a:3b:e6"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar HybridROC2"
+  ip         : "172.16.5.44/29"
+  sdesc      : "2HybridROC1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "124"
+  ssid       : "il-z.roc2.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.5.43/29"
+  ns_mac     : "00:27:22:8a:3b:bb"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar ZTWGemeentehuis"
+  ip         : "172.16.4.217/29"
+  sdesc      : "2ZTWGemeentehuis"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "124"
+  ssid       : "il-nno.ztwdorpskerk.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.4.218/29"
+  ns_mac     : "00:27:22:8a:3d:0d"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+iface_vr1_alias0:
+  comment    : "Link naar Suetanborgh"
+  ip         : "172.16.9.97/29"
+  status     : "planned"
+  type       : "eth"
+
+
+iface_vr2:
+  comment    : "Omni voor de Buurt"
+  ip         : "172.17.62.1/24"
+  sdesc      : "2buurt"
+  mode       : "ap"
+  type       : "eth"
+  channel    : "10"
+  ssid       : "ap-ZTW-Dorpskerk-Plein"
+  dhcp       : "10-240"
+  compass    : "o"
+  ns_ip      : "172.17.62.2/24"
+  ns_mac     : "00:15:6d:30:d2:b8"
+  bridge_type: "NanoStation2"
+  status     : "up"
+
+
Index: nodes/ZTWGemeentehuis/wleiden.yaml
===================================================================
--- nodes/ZTWGemeentehuis/wleiden.yaml	(revision 13401)
+++ nodes/ZTWGemeentehuis/wleiden.yaml	(revision 13401)
@@ -0,0 +1,82 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+latitude  : "52.12520"
+location  : "Noorbuurtseweg 27, 2381 ET, Zoeterwoude"
+longitude : "4.49820"
+masterip  : "172.17.60.1"
+monitoring_group: "wleiden"
+nodename  : "ZTWGemeentehuis"
+nodetype  : "Hybrid"
+rdnap_x   : 94122
+rdnap_y   : 460038
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Link naar Buurt"
+  ip         : "172.17.60.1/26"
+  sdesc      : "2buurt"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "ap-ZTW-Gemeente"
+  dhcp       : "10-60"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar ZTWDorpskerk"
+  ip         : "172.16.4.220/29"
+  sdesc      : "2dorpskerk"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "124"
+  ssid       : "il-nno.ztwdorpskerk.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.4.219/29"
+  ns_mac     : "00:15:6d:70:54:c9"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Meerburgkerk - uitgezet slechte link"
+  ip         : "172.16.4.105/29"
+  sdesc      : "2meerburgkerk"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-no.ztwgemeentehuis.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.4.106/29"
+  ns_mac     : "00:15:6d:70:53:6d"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Omni voor de Buurt"
+  ip         : "172.17.59.1/24"
+  sdesc      : "2buurt"
+  mode       : "ap-wds"
+  type       : "eth"
+  ssid       : "ap-ZTW-Gemeemte-Buurt"
+  dhcp       : "10-240"
+  ns_ip      : "172.17.59.2/24"
+  ns_mac     : "00:15:6d:e8:e6:a4"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+
Index: nodes/ZTWMeerburgkerk/wleiden.yaml
===================================================================
--- nodes/ZTWMeerburgkerk/wleiden.yaml	(revision 13401)
+++ nodes/ZTWMeerburgkerk/wleiden.yaml	(revision 13401)
@@ -0,0 +1,92 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.14516"
+location  : "Meerburgkerk, Hoge Rijndijk 18, 2382 AS, Zoeterwoude-Rijndijk"
+longitude : "4.52397"
+masterip  : "172.17.114.1"
+monitoring_group: "zoeterwoude"
+nodename  : "ZTWMeerburgkerk"
+nodetype  : "Hybrid"
+portal_sponsor: "Gemeente Zoeterwoude en Parochiekern De Goede Herder"
+portal_url: "http://rkleiden.nl/degoedeherder/"
+rdnap_x   : 95913
+rdnap_y   : 462237
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+iface_ue0:
+  comment    : "Link naar Heineken"
+  ip         : "172.16.7.212/29"
+  sdesc      : "2heineken"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-nw.heineken.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.7.211/29"
+  ns_mac     : "dc:9f:db:64:23:63"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar VVMeerburg"
+  ip         : "172.16.5.84/29"
+  sdesc      : "2Meerburg"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-no.meerburg.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.5.83/29"
+  ns_mac     : "dc:9f:db:64:24:5f"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar NO"
+  ip         : "172.16.7.201/29"
+  sdesc      : "2no"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "100"
+  ssid       : "il-no.meerburgkerk.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.7.202"
+  ns_mac     : "dc:9f:db:64:23:a3"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar ZTW-Gemeentehuis 172.16.4.108/29"
+  ip         : "172.16.4.108/29"
+  sdesc      : "2gemhuis"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "36"
+  ssid       : "il-no.ztwgemeentehuis.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.4.107/29"
+  ns_mac     : "dc:9f:db:64:24:bb"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
Index: nodes/ZTWRijneke/wleiden.yaml
===================================================================
--- nodes/ZTWRijneke/wleiden.yaml	(revision 13401)
+++ nodes/ZTWRijneke/wleiden.yaml	(revision 13401)
@@ -0,0 +1,109 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.13784"
+location  : "Casba, Hoge Rijndijk 315, 2382 AP, Zoeterwoude Rijndijk"
+longitude : "4.54943"
+masterip  : "172.17.58.1"
+monitoring_group: "wleiden"
+nodename  : "ZTWRijneke"
+nodetype  : "Hybrid"
+portal_sponsor: "Rijneke Boulevard"
+portal_url: "http://www.rijneke.nl/"
+rdnap_x   : 97646
+rdnap_y   : 461403
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ue0:
+  comment    : "Link naar Meelfabriek1"
+  ip         : "172.16.9.196/29"
+  sdesc      : "2meelfab1"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-zo.meelfabriek1.wleiden.net"
+  dhcp       : False
+  ns_ip      : "172.16.9.195"
+  ns_mac     : "00:27:22:8a:3b:f3"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_ue1:
+  comment    : "Link naar HMKerk"
+  ip         : "172.16.5.252/29"
+  sdesc      : "2hmkerk"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-zw.hmkerk.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.5.251"
+  ns_mac     : "00:27:22:8a:3b:4f"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Accesspoints via switch; 00:27:22:E2:52:3C 172.17.58.3"
+  ip         : "172.17.58.1/24"
+  sdesc      : "2aps"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "3"
+  ssid       : "apw-ZTW-RijnekeBlvd"
+  dhcp       : "10-250"
+  compass    : "w"
+  ns_ip      : "172.17.58.2/24"
+  ns_mac     : "00:27:22:e2:53:d8"
+  bridge_type: "NanoStation M2"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar wbrotary"
+  ip         : "172.16.18.28/29"
+  sdesc      : "2wbrotary"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-wzw.wbrotary.wleiden.net"
+  dhcp       : False
+  compass    : "no"
+  ns_ip      : "172.16.18.27/29"
+  ns_mac     : "00:27:22:8a:3b:35"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar StJan"
+  ip         : "172.16.3.233/29" 
+  sdesc      : "2StJan"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "60"
+  ssid       : "il-zw.rijneke.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.3.234"
+  ns_mac     : "00:27:22:8a:3b:d0"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
Index: nodes/ZTWvdSterre/wleiden.yaml
===================================================================
--- nodes/ZTWvdSterre/wleiden.yaml	(revision 13401)
+++ nodes/ZTWvdSterre/wleiden.yaml	(revision 13401)
@@ -0,0 +1,122 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.09163"
+location  : "C. van der Sterre, Gelderswoudseweg 11A, 2735 PB  Gelderswoude (gem. Zoeterwoude)"
+longitude : "4.53064"
+masterip  : "172.17.49.1"
+monitoring_group: "wleiden"
+nodename  : "ZTWvdSterre"
+nodetype  : "Hybrid"
+portal_sponsor: "V.d.Sterre Revalidatie & Autoservice"
+portal_url: "http://www.vandersterre.net//"
+rdnap_x   : 96299
+rdnap_y   : 456277
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP Begane Grond"
+  ip         : "172.17.49.1/24"
+  sdesc      : "apbg"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 6
+  ssid       : "ap-ZTW-VdSterre"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Accesspoint Noord kabel 4"
+  ip         : "172.17.105.1/24"
+  sdesc      : "2apn"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "1"
+  ssid       : "apn-ZTW-VdSterre"
+  dhcp       : "10-250"
+  compass    : "n"
+  ns_ip      : "172.17.105.2/24"
+  ns_mac     : "dc:9f:db:36:1d:b6"
+  bridge_type: "NanoStation M2"
+  status     : "up"
+
+
+iface_ue1:
+  comment    : "Link naar Ronald kabel 2"
+  ip         : "172.16.7.129/29"
+  sdesc      : "2ronald"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "140"
+  ssid       : "il-w.vdsterre.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.7.130/29"
+  ns_mac     : "dc:9f:db:2a:29:62"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Accesspoint Zuid kabel 1"
+  ip         : "172.17.106.1/24"
+  sdesc      : "2apz"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "11"
+  ssid       : "apz-ZTW-VdSterre"
+  dhcp       : "10-250"
+  compass    : "z"
+  ns_ip      : "172.17.106.2/24"
+  ns_mac     : "dc:9f:db:36:1d:e3"
+  bridge_type: "NanoStation M2"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Heineken kabel 5"
+  ip         : "172.16.7.4/29"
+  sdesc      : "2heineken"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "132"
+  ssid       : "il-z.heineken.wleiden.net"
+  dhcp       : False
+  compass    : "n"
+  ns_ip      : "172.16.7.3/29"
+  ns_mac     : "dc:9f:db:e4:98:b8"
+  bridge_type: "NanoStation M5"
+  status     : "down"
+
+
+iface_vr2:
+  comment    : "Link naar StJan kabel 3"
+  ip         : "172.16.3.228/29"
+  sdesc      : "2StJan"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "52"
+  ssid       : "il-zo.stjan.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.3.227/29"
+  ns_mac     : "dc:9f:db:2a:2b:4d"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
Index: nodes/Zijloever/wleiden.yaml
===================================================================
--- nodes/Zijloever/wleiden.yaml	(revision 13401)
+++ nodes/Zijloever/wleiden.yaml	(revision 13401)
@@ -0,0 +1,84 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+latitude  : "52.16161"
+location  : "Zorgvoorziening Zijloever, Lage Rijndijk 129, 2315 JS, Leiden"
+longitude : "4.51431"
+masterip  : "172.19.0.1"
+monitoring_group: "wleiden"
+nodename  : "Zijloever"
+nodetype  : "Hybrid"
+rdnap_x   : 95274
+rdnap_y   : 464075
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Ap"
+  ip         : "172.19.0.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "90:a4:de:8b:e3:10"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link naar SOM2"
+  ip         : "172.16.4.228/29"
+  sdesc      : "2som2"
+  mode       : "station-wds"
+  type       : "eth"
+  channel    : "36"
+  ssid       : "il-zo.som2.wleiden.net"
+  dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.4.227/29"
+  ns_mac     : "00:15:6d:f6:be:ec"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Roomburgh2"
+  ip         : "172.16.4.236/29"
+  sdesc      : "2roomburgh3"
+  mode       : "station-wds"
+  type       : "eth"
+  channel    : "44"
+  ssid       : "il-n.roomburgh2.wleiden.net"
+  dhcp       : False
+  compass    : "z"
+  ns_ip      : "172.16.4.235/29"
+  ns_mac     : "00:15:6d:70:4d:a9"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Link naar Meelfabriek2"
+  ip         : "172.16.9.220/29"
+  sdesc      : "2meelfab2s"
+  mode       : "station-wds"
+  type       : "eth"
+  channel    : "44"
+  ssid       : "il-no.meelfabriek2.wleiden.net"
+  dhcp       : False
+  compass    : "zw"
+  ns_ip      : "172.16.9.219/29"
+  ns_mac     : "00:27:22:8a:3b:ab"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
Index: nodes/ZwaluwAK/wleiden.yaml
===================================================================
--- nodes/ZwaluwAK/wleiden.yaml	(revision 13401)
+++ nodes/ZwaluwAK/wleiden.yaml	(revision 13401)
@@ -0,0 +1,93 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+externalif: "vr0"
+latitude  : "52.15366"
+location  : "PC Basisschool De Zwaluw, A. Kleijnstraat 8, 2331 DV, Leiden"
+longitude : "4.44826"
+masterip  : "172.22.0.1"
+monitoring_group: "wleiden"
+nodename  : "ZwaluwAK"
+nodetype  : "Hybrid"
+rdnap_x   : 90743
+rdnap_y   : 463247
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Omni voor de buurt"
+  ip         : "172.22.0.1/24"
+  sdesc      : "omni"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "WiFi-Leiden"
+  wlan_mac   : "00:1b:b1:00:eb:e4"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "A-link naar Vosko2"
+  ip         : "172.16.4.36/29"
+  sdesc      : "2vosko2"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-w.vosko2.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.4.35"
+  ns_mac     : "00:15:6d:f2:39:44"
+  bridge_type: "Nanostation5"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "External Link"
+  ip         : "0.0.0.0/30"
+  sdesc      : "2external"
+  type       : "eth"
+  dhcp       : "client"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "AP-NOORD via Bullet2 en SD15"
+  ip         : "172.17.117.1/24"
+  mode       : "ap"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "WiFi-Leiden-N"
+  channel    : 6
+  dhcp       : "10-250"
+  ns_ip      : "172.17.117.2"
+  ns_mac     : "00:15:6d:e8:e7:4a"
+  bridge_type: "Bullet2"
+  status     : "up"
+
+
+#iface_vr2:
+#  comment    : "Link richting iBCStevenshof via Bullet2"
+#  ip         : "172.16.3.251/29"
+#  sdesc      : "2bcste"
+#  mode       : "station-wds"
+#  type       : "eth"
+#  extra_type : "eth2wifibridge"
+#  ssid       : "il-nw.bcste.wleiden.net"
+#  dhcp       : False
+#  compass    : "zo"
+#  ns_ip      : "172.16.3.252/29"
+#  ns_mac     : "00:15:6d:e8:e6:a3"
+#  bridge_type: "Bullet2"
+#  status     : "down"
+
+
Index: nodes/Zwet/wleiden.yaml
===================================================================
--- nodes/Zwet/wleiden.yaml	(revision 13401)
+++ nodes/Zwet/wleiden.yaml	(revision 13401)
@@ -0,0 +1,133 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+externalif: "ue0"
+latitude  : "52.11836"
+location  : "Fam van der Zwet, Nieuweweg 3, 2381 NW,Zoeterwoude "
+longitude : "4.50131"
+masterip  : "172.27.129.1"
+monitoring_group: "wzoeterwoude"
+nodename  : "Zwet"
+nodetype  : "Hybrid"
+rdnap_x   : 94326
+rdnap_y   : 459275
+release   : "9.0-RELEASE"
+remote_access: "rvdzwet.xs4all.nl:1022"
+rdr_host  : "rvdzwet.xs4all.nl"
+rdr_rules :
+- ['tcp', 9080, '172.17.0.41', 80]
+- ['tcp', 9081, '172.17.0.42', 554]
+- ['tcp', 9082, '172.17.0.43', 554]
+- ['tcp', 9083, '172.17.0.44', 80]
+- ['tcp', 9084, '172.17.0.43', 80]
+- ['tcp', 9085, '172.17.0.42', 80]
+- ['tcp', 9086, '172.17.0.45', 21]
+- ['tcp', 9087, '172.17.0.45', 3389]
+- ['tcp', 9090, '172.17.2.67', 80]
+- ['tcp', 9091, '172.16.9.237', 88]
+- ['tcp', 9092, '172.17.51.5', 80]
+- ['tcp', 9093, '172.16.3.142', 8080]
+- ['tcp', 9094, '172.17.20.5', 80]
+- ['tcp', 9095, '172.17.20.5', 554]
+- ['tcp', 9096, '172.17.13.66', 88]
+- ['tcp', 9097, '172.16.3.190', 8080]
+- ['tcp', 9098, '172.16.3.134', 8080]
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: True
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Omni voor Tuin"
+  ip         : "172.27.129.1/26"
+  sdesc      : "2buurt"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 11
+  ssid       : "ap-ZTW-Zwet-Tuin"
+  dhcp       : "10-60"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link to house"
+  ip         : "192.168.178.51/24"
+  sdesc      : "2house"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+iface_ue0_alias0:
+  comment    : "Link to buzz"
+  ip         : "172.27.129.65/28"
+  sdesc      : "2buzz"
+  type       : "eth"
+  status     : "up"
+
+iface_ue1:
+  comment    : "Link to MuziekCentrum"
+  ip         : "172.16.9.89/29"
+  sdesc      : "2muziekcentrum"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-w.zwet.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.9.90/29"
+  ns_mac     : "dc:9f:db:64:2d:2c"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+iface_vr0:
+  comment    : "Link naar JAR"
+  ip         : "172.16.4.49/29"
+  sdesc      : "2jar"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-z.zwet.wleiden.net"
+  dhcp       : False
+  compass    : "zo"
+  ns_ip      : "172.16.4.50/29"
+  ns_mac     : "00:27:22:10:fd:d5"
+  bridge_type: "NanoStation M5"
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link to PVKerkDuif"
+  ip         : "172.16.16.169/29"
+  sdesc      : "2pvkerkduif"
+  mode       : "ap-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-o.zwet.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.16.170/29"
+  ns_mac     : "00:15:6d:bd:89:93"
+  bridge_type: "NanoStation5"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Omni voor de Buurt"
+  ip         : "172.27.129.129/26"
+  sdesc      : "2buurt"
+  mode       : "ap-wds"
+  type       : "eth"
+  ssid       : "ap-ZTW-Zwet-Buurt"
+  dhcp       : "140-180"
+  ns_ip      : "172.27.129.130/26"
+  ns_mac     : "00:27:22:66:6c:bc"
+  bridge_type: "Bullet M2"
+  status     : "up"
+
+
