Index: nodes/Rick2/wleiden.yaml
===================================================================
--- nodes/Rick/wleiden.yaml	(revision 13704)
+++ nodes/Rick2/wleiden.yaml	(revision 13745)
@@ -8,9 +8,7 @@
 location  : "Rick van der Zwet, Polderpeil 1, 2382 BW, Zoeterwoude"
 longitude : "4.517"
-masterip  : "172.17.34.1"
-gateway   : "80.127.152.25"
-serviceid : "172.31.254.9"
+masterip  : "172.17.29.1"
 monitoring_group: "wzoeterwoude"
-nodename  : "Rick"
+nodename  : "Rick2"
 nodetype  : "Hybrid"
 portal_sponsor: "Free-WiFi Zoeterwoude"
@@ -18,43 +16,18 @@
 rdnap_x   : 95421
 rdnap_y   : 462103
-rdr_host  : "80.127.152.27"
-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"
+release   : "11.0-RELEASE"
 service_accesspoint: True
 service_concentrator: False
-service_incoming_rdr: True
-service_proxy_ileiden: True 
-service_proxy_normal: True
-status    : "up"
+service_incoming_rdr: False 
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "down"
 
 iface_bridge0:
   comment    : "Access Points"
   type       : "eth"
-  ip         : "172.17.34.1/24"
+  ip         : "172.17.29.1/24"
   dhcp       : "10-240"
 
-iface_ue0:
-  comment    : "Loco tegen het raam"
-  parent     : "bridge0"
-  sdesc      : "2buiten"
-  mode       : "ap-wds"
-  type       : "eth"
-  ssid       : "Wifi Zoeterwoude"
-  channel    : 1
-  ns_ip      : "172.17.34.2/24"
-  ns_mac     : "dc:9f:db:3e:19:a1"
-  ns_type    : "ns2"
-  bridge_type: "NanoStationLocoM2"
-  status     : "up"
 
 iface_ath0:
@@ -65,45 +38,35 @@
   type       : "11g"
   channel    : 6
-  ssid       : "WiFi Zoeterwoude"
+  ssid       : "WiFi Zoeterwoude Development"
   status     : "up"
 
 iface_vr0:
-  comment    : "Uplink XS4ALL FTTH (VAS)"
-  ip         : "80.127.152.27/29"
-  sdesc      : "2external"
+  comment    : "Link naar Rick"
+  ip         : "172.16.6.121/29"
+  sdesc      : "2rick"
   type       : "eth"
   dhcp       : False
   status     : "up"
-  
+
+iface_vr0_alias0:
+  comment    : "Link naar JVC"
+  ip         : "172.16.7.129/29"
+  sdesc      : "2rick"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
 
 iface_vr1:
-  comment    : "Link naar Meerburgkerk"
-  ip         : "172.16.3.100/29"
-  sdesc      : "2meerburgkerk"
-  mode       : "station-wds"
+  comment    : "Development AP Ethernet Interface"
+  parent     : "bridge0"
+  sdesc      : "2ap"
   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_vr2:
-  comment    : "Link naar JVC"
-  ip         : "172.16.6.116/29"
-  sdesc      : "2jvc"
-  mode       : "station-wds"
+  comment    : "Development Interlink Interface"
+  ip         : "172.16.6.118/29"
+  sdesc      : "2unused"
   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"