Index: nodes/HybridGHR/wleiden.yaml
===================================================================
--- nodes/HybridZwet/wleiden.yaml	(revision 12682)
+++ nodes/HybridGHR/wleiden.yaml	(revision 12907)
@@ -4,16 +4,12 @@
 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"
+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"
-rdnap_x   : 94326
-rdnap_y   : 459275
 release   : "9.0-RELEASE"
-remote_access: "buzz.vanderzwet.net:2022"
 service_accesspoint: True
 service_concentrator: False
@@ -22,61 +18,32 @@
 service_proxy_normal: False
 status    : "up"
+portal_sponsor: "Groene Hart Recreatie"
+portal_url: "http://www.groenehart-recreatie.nl"
 
 
 iface_ath0:
-  comment    : "Omni voor Tuin"
-  ip         : "172.27.129.1/26"
+  comment    : "Omni voor Buurt MGMT"
+  ip         : "172.17.149.1/24"
   sdesc      : "2buurt"
   mode       : "ap"
   type       : "11g"
   channel    : 11
-  ssid       : "ap-ZTW-Zwet-Tuin"
-  dhcp       : "10-60"
+  ssid       : "ap-GHR-Management"
+  dhcp       : "10-240"
   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"
+iface_vr0:
+  comment    : "Link naar StBavo2"
+  ip         : "172.16.3.124/29"
+  sdesc      : "2stbavo"
   mode       : "ap-wds"
   type       : "eth"
   extra_type : "eth2wifibridge"
-  ssid       : "il-w.zwet.wleiden.net"
+  ssid       : "il-zo.stbavo2.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"
+  compass    : "no"
+  ns_ip      : "172.16.3.123/29"
+  ns_mac     : "00:00:00:00:00:00"
   bridge_type: "NanoStation M5"
   status     : "up"
@@ -84,31 +51,43 @@
 
 iface_vr1:
-  comment    : "Link to PVKerkDuif"
-  ip         : "172.16.16.169/29"
-  sdesc      : "2pvkerkduif"
+  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-o.zwet.wleiden.net"
+  ssid       : "il-nw.ghr.wleiden.net"
   dhcp       : False
-  compass    : "o"
-  ns_ip      : "172.16.16.170/29"
-  ns_mac     : "00:15:6d:bd:89:93"
-  bridge_type: "NanoStation5"
+  compass    : "nw"
+  ns_ip      : "172.16.7.67/29"
+  ns_mac     : "00:00:00:00:00:00"
+  bridge_type: "NanoStation M5"
   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"
-
-