Index: /nodes/HybridHaagwijk/wleiden.yaml
===================================================================
--- /nodes/HybridHaagwijk/wleiden.yaml	(revision 11231)
+++ /nodes/HybridHaagwijk/wleiden.yaml	(revision 11231)
@@ -0,0 +1,99 @@
+# 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"
+nodename  : "Haagwijk"
+nodetype  : "Hybrid"
+rdnap_x   : 92434
+rdnap_y   : 461987
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+iface_ath0:
+  comment    : "Ap"
+  ip         : "172.20.144.1/24"
+  sdesc      : "ap"
+  mode       : "ap"
+  type       : "11b"
+  channel    : "8"
+  ssid       : "ap-WirelessLeiden-Haagwijk"
+  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    : "36"
+  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/HybridROC2/wleiden.yaml
===================================================================
--- /nodes/HybridROC2/wleiden.yaml	(revision 11231)
+++ /nodes/HybridROC2/wleiden.yaml	(revision 11231)
@@ -0,0 +1,110 @@
+# 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"
+nodename  : "ROC2"
+nodetype  : "Hybrid"
+rdnap_x   : 93822
+rdnap_y   : 462243
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "up"
+
+
+iface_ath0:
+  comment    : "AP Noord"
+  ip         : "172.21.1.1/24"
+  sdesc      : "ap-n"
+  mode       : "ap"
+  type       : "11b"
+  channel    : "3"
+  ssid       : "ap-WirelessLeiden-Roc2"
+  dhcp       : "10-250"
+  status     : "up"
+
+
+iface_ue0:
+  comment    : "Link naar Zwet"
+  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     : "down"
+
+
+iface_ue1:
+  comment    : "Link naar LCPL"
+  ip         : "172.16.5.17/29"
+  sdesc      : "2lcpl"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-w.roc2.wleiden.net"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.5.18/29"
+  ns_mac     : "00:15:6d:70:54:a3"
+  bridge_type: "NanoStation5"
+  status     : "down"
+
+
+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"
+
+