Index: /nodes/HybridRick/wleiden.yaml
===================================================================
--- /nodes/HybridRick/wleiden.yaml	(revision 10687)
+++ /nodes/HybridRick/wleiden.yaml	(revision 10688)
@@ -15,14 +15,12 @@
 release   : "9.0-RELEASE"
 remote_access: "riff.vanderzwet.net:2022"
-service_proxy_ileiden: True
-service_proxy_normal: True
 status    : "up"
 
 
 iface_ath0:
-  comment    : "Internal Wireless"
+  comment    : "Wireless for neighboorhood"
   interface  : "ath0"
   ip         : "172.20.145.1/26"
-  desc       : "Internal Wireless"
+  desc       : "Omni"
   sdesc      : "binnen"
   mode       : "ap-wds"
@@ -31,31 +29,27 @@
   ssid       : "ap-WirelessLeiden-Rick"
   dhcp       : "10-60"
-  captive_portal_whitelist: "172.20.145.26"
   compass    : "None"
-  dhcp_static: "00:22:43:84:32:6d,172.20.145.26;00:22:43:84:32:7d,172.20.145.27"
   status     : "up"
 
-
 iface_vr0:
-  comment    : "Link to external interface"
+  comment    : "Link naar Rick2"
   interface  : "vr0"
-  ip         : "0.0.0.0/30"
-  desc       : "External Link"
-  sdesc      : "2external"
+  ip         : "172.16.3.66/30"
+  desc       : "Link naar Rick2"
+  sdesc      : "2rick2"
   type       : "eth"
   dhcp       : False
   compass    : "None"
-  dhcpclient : True
   status     : "up"
 
 iface_vr1:
-  comment    : "Access Point achter"
+  comment    : "Access Point West"
   interface  : "vr1"
   ip         : "172.20.145.65/26"
   desc       : "Access Point"
-  sdesc      : "binnen"
+  sdesc      : "west"
   mode       : "ap-wds"
   type       : "eth"
-  ssid       : "ap-WirelessLeiden-Rick-2"
+  ssid       : "ap-WirelessLeiden-Rick-West"
   dhcp       : "70-120"
   compass    : "None"
Index: /nodes/HybridRick2/wleiden.yaml
===================================================================
--- /nodes/HybridRick2/wleiden.yaml	(revision 10688)
+++ /nodes/HybridRick2/wleiden.yaml	(revision 10688)
@@ -0,0 +1,71 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+comment   : "None"
+ileiden   : False
+latitude  : "52.13999"
+location  : "Rick  van der Zwet, Brahmslaan 40, 2324 AN, Leiden"
+longitude : "4.47100"
+masterip  : "172.17.34.1"
+nodename  : "Rick2"
+nodetype  : "Hybrid"
+rdnap_x   : 92280
+rdnap_y   : 461707
+release   : "9.0-RELEASE"
+service_proxy_ileiden: True
+service_proxy_normal: True
+status    : "up"
+
+
+iface_ath0:
+  comment    : "Internal Wireless"
+  interface  : "ath0"
+  ip         : "172.17.34.1/28"
+  desc       : "Internal Wireless"
+  sdesc      : "binnen"
+  mode       : "ap-wds"
+  type       : "11b"
+  channel    : "1"
+  ssid       : "ap-WirelessLeiden-Rick2"
+  dhcp       : "10-60"
+  compass    : "None"
+  status     : "up"
+
+
+iface_vr0:
+  comment    : "Link to external interface"
+  interface  : "vr0"
+  ip         : "0.0.0.0/30"
+  desc       : "External Link"
+  sdesc      : "2external"
+  type       : "eth"
+  dhcp       : False
+  compass    : "None"
+  dhcpclient : True
+  status     : "up"
+
+
+iface_vr1:
+  comment    : "Link naar Rick"
+  interface  : "vr1"
+  ip         : "172.16.3.65/30"
+  desc       : "Link naar Rick"
+  sdesc      : "2rick"
+  type       : "eth"
+  dhcp       : False
+  compass    : "None"
+  status     : "up"
+
+
+iface_vr2:
+  comment    : "Lokaal Dev Netwerk"
+  interface  : "vr2"
+  ip         : "172.17.36.1/24"
+  desc       : "LokaalDev"
+  sdesc      : "2dev"
+  type       : "eth"
+  dhcp       : "10-20"
+  compass    : "None"
+  status     : "up"
+