Index: nodes/ThomasUit/wleiden.yaml
===================================================================
--- nodes/Rick/wleiden.yaml	(revision 13905)
+++ nodes/ThomasUit/wleiden.yaml	(revision 14006)
@@ -4,19 +4,19 @@
 board     : "ALIX2"
 comment   : "None"
-gateway   : "80.127.152.25"
+gateway   : "192.168.178.1"
 ileiden   : True
-latitude  : "52.145"
-location  : "Rick van der Zwet, Polderpeil 1, 2382 BW, Zoeterwoude"
-longitude : "4.517"
-masterip  : "172.17.34.1"
-monitoring_group: "wzoeterwoude"
-nodename  : "Rick"
+latitude  : "52.000"
+location  : "Thomas Uittenbogaard, XXX, XXXX XX, Leiden"
+longitude : "4.000"
+masterip  : "172.17.115.1"
+monitoring_group: "wleiden"
+nodename  : "ThomasUit"
 nodetype  : "Hybrid"
-portal_sponsor: "Free-WiFi Zoeterwoude"
+portal_sponsor: "Thomas Uittenbogaard"
 portal_url: "http://www.wirelessleiden.nl/"
-rdnap_x   : 95421
-rdnap_y   : 462103
+rdnap_x   : 95000
+rdnap_y   : 462000
 rdr_host  : "80.127.152.27"
-release   : "9.0-RELEASE"
+release   : "11.1-RELEASE"
 service_accesspoint: True
 service_concentrator: False
@@ -24,5 +24,5 @@
 service_proxy_ileiden: True
 service_proxy_normal: True
-serviceid : "172.31.254.9"
+serviceid : "172.31.254.20"
 status    : "up"
 
@@ -33,7 +33,7 @@
   sdesc      : "apbinnen"
   mode       : "ap"
-  type       : "11g"
-  channel    : 6
-  ssid       : "WiFi Zoeterwoude"
+  type       : "11a"
+  channel    : "40" 
+  ssid       : "WiFi Leiden"
   status     : "up"
 
@@ -41,5 +41,5 @@
 iface_bridge0:
   comment    : "Access Points"
-  ip         : "172.17.34.1/24"
+  ip         : "172.17.115.1/24"
   type       : "eth"
   dhcp       : "10-240"
@@ -47,6 +47,6 @@
 
 iface_vr0:
-  comment    : "Uplink XS4ALL FTTH (VAS)"
-  ip         : "80.127.152.27/29"
+  comment    : "Uplink Ziggo"
+  ip         : "192.168.178.10/24"
   sdesc      : "2external"
   type       : "eth"
@@ -54,38 +54,6 @@
   status     : "up"
 
-iface_vr1_102:
-  comment    : "Link naar JVC"
-  ip         : "172.16.6.116/29"
-  sdesc      : "2jvc"
-  mode       : "station-wds"
-  type       : "eth"
-  extra_type : "eth2wifibridge"
-  channel    : "36"
-  ssid       : "il-no.jvc.wleiden.net"
-  dhcp       : False
-  compass    : "zw"
-  ns_ip      : "172.16.6.115/29"
-  ns_mac     : "00:27:22:11:fd:ed"
-  bridge_type: "NanoStation M5"
-  status     : "up"
-
-iface_vr1_103:
-  comment    : "Link naar Meerburgkerk"
-  ip         : "172.16.3.100/29"
-  sdesc      : "2meerburgkerk"
-  mode       : "station-wds"
-  type       : "eth"
-  extra_type : "eth2wifibridge"
-  channel    : "116"
-  ssid       : "il-wzw.mbkerk.wleiden.net"
-  dhcp       : False
-  compass    : "o"
-  ns_ip      : "172.16.3.99/29"
-  ns_mac     : "24:a4:3c:72:01:95"
-  bridge_type: "NanoStation M5"
-  status     : "up"
-
-iface_vr1_104:
-  comment    : "Loco tegen het raam"
+iface_vr1:
+  comment    : "UniFi AP AC Mesh"
   parent     : "bridge0"
   sdesc      : "2buiten"
@@ -93,44 +61,32 @@
   type       : "eth"
   channel    : 1
-  ssid       : "Wifi Zoeterwoude"
-  ns_ip      : "172.17.34.2/24"
-  ns_mac     : "dc:9f:db:3e:19:a1"
-  ns_type    : "ns2"
-  bridge_type: "NanoStationLocoM2"
+  ssid       : "Wifi Leiden"
+  ns_ip      : "172.17.115.2/24"
+  ns_mac     : "xx:xx:xx:xx:xx:xx"
+  ns_type    : "mesh"
+  bridge_type: "UniFi"
   status     : "up"
 
-iface_vr1_105:
-  comment    : "Link naar Rick2"
-  ip         : "172.16.6.124/29"
-  sdesc      : "2rick2"
+iface_vr1_extra0:
+  comment    : "Monitoring Server"
+  ip         : "172.17.115.5/24"
+  sdesc      : "2monitor"
   type       : "eth"
   dhcp       : False
   status     : "up"
 
-
-
 iface_vr2:
-  comment    : "Link to Server"
-  ip         : "172.17.107.1/24"
-  sdesc      : "2druif"
+  comment    : "Link naar Meelfabriek1"
+  ip         : "172.16.6.148/29"
+  sdesc      : "2meelfabriek1"
+  mode       : "station-wds"
   type       : "eth"
+  extra_type : "eth2wifibridge"
+  ssid       : "il-zo.meelfabriek1.wleiden.net"
   dhcp       : False
+  compass    : "nw"
+  ns_ip      : "172.16.6.147/29"
+  ns_mac     : "00:00:00:00:00:00"
+  bridge_type: "NanoBeam M5"
   status     : "up"
 
-iface_vr2_extra0:
-  comment    : "UniFi Cloud Key"
-  ip         : "172.17.107.10/24"
-  sdesc      : "2unifi"
-  type       : "eth"
-  dhcp       : False
-  status     : "up"
-
-iface_vr2_extra1:
-  comment    : "Access from private network Zwet"
-  ip         : "172.17.107.20/24"
-  sdesc      : "2routerZW"
-  type       : "eth"
-  dhcp       : False
-  status     : "up"
-
-