Index: /nodes/TEYJOP/wleiden.yaml
===================================================================
--- /nodes/TEYJOP/wleiden.yaml	(revision 13496)
+++ /nodes/TEYJOP/wleiden.yaml	(revision 13496)
@@ -0,0 +1,117 @@
+# Genesis config yaml style
+# vim:ts=2:et:sw=2:ai
+#
+board     : "ALIX2"
+latitude  : "52.217889"
+location  : "Park Overbosch, Sportlaan 3, 2215NB Voorhout"
+longitude : "4.479404"
+masterip  : "172.17.87.1"
+monitoring_group: "teylingen"
+nodename  : "TEYJOP"
+nodetype  : "Hybrid"
+portal_sponsor: "Gemeente Teylingen"
+portal_url: "http://www.teylingen.nl/"
+rdnap_x   : 92964
+rdnap_y   : 470366
+release   : "9.0-RELEASE"
+service_accesspoint: True
+service_concentrator: False
+service_incoming_rdr: False
+service_proxy_ileiden: False
+service_proxy_normal: False
+status    : "down"
+
+
+iface_ath0:
+  comment    : "PA4040 voor lokaal ap"
+  ip         : "172.17.88.1/24"
+  sdesc      : "2apzo"
+  mode       : "ap"
+  type       : "11g"
+  channel    : 1
+  ssid       : "WiFi-Voorhout"
+  wlan_mac   : "00:1b:b1:00:ec:94"
+  dhcp       : "10-240"
+  status     : "up"
+
+iface_ue0:
+  comment    : "Ap-zuidwest repeater sectorantenne 120 graden kabel 3"
+  ip         : "172.17.87.1/24"
+  sdesc      : "2apzw"
+  mode       : "ap-repeater"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "11"
+  ssid       : "WiFi Voorhout"
+  dhcp       : "10-240"
+  ns_ip      : "172.17.87.2/24"
+  ns_mac     : "dc:9f:db:0c:30:2a"
+  bridge_type: "RocketM2"
+  status     : "up"
+
+iface_vr0:
+  comment    : "Link naar "
+  ip         : "172.16.5.188/29"
+  sdesc      : "2xxx"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : ""
+  ssid       : "il-zzo.dekijker.wleiden.net"
+  mode       : "ap-wds"
+  dhcp       : False
+  compass    : "w"
+  ns_ip      : "172.16.5.187"
+  ns_mac     : ""
+  bridge_type: "NanoStationM5"
+  status     : "up"
+
+iface_vr1:
+  comment    : "Link naar TEYBestuurscentrum kabel 1"
+  ip         : "172.16.6.236/29"
+  sdesc      : "2no"
+  mode       : "station-wds"
+  type       : "eth"
+  extra_type : "eth2wifibridge"
+  channel    : "116"
+  ssid       : "il-zw.teybestuurscentrum.wleiden.net"
+  dhcp       : False
+  compass    : "o"
+  ns_ip      : "172.16.6.235/29"
+  ns_mac     : "dc:9f:db:2e:0a:a6"
+  bridge_type: "NanoBridgeM5"
+  status     : "up"
+
+iface_vr1_alias0:
+  comment    : "bridge management interface 172.16.7.58"
+  ip         : "172.16.7.57/29"
+  sdesc      : "2bridge"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+iface_vr2:
+  comment    : "Link naar zzo kabel 2"
+  ip         : "172.16.10.4/29"
+  sdesc      : "2oost"
+  mode       : "station-wds"
+  type       : "eth"
+  channel    : "136"
+  ssid       : "il-zw.teyakzonobel2.wleiden.net"
+  dhcp       : False
+  compass    : "zzo"
+  ns_ip      : "172.16.10.3/29"
+  ns_mac     : "dc:9f:db:2e:0b:01"
+  bridge_type: "NanoBridgeM5"
+  status     : "up"
+
+iface_vr2_alias0:
+  comment    : "bridge management interface 172.16.6.162"
+  ip         : "172.16.6.161/29"
+  sdesc      : "2bridge"
+  type       : "eth"
+  dhcp       : False
+  status     : "up"
+
+
+
+
Index: des/VisitorCentre/wleiden.yaml
===================================================================
--- /nodes/VisitorCentre/wleiden.yaml	(revision 13495)
+++ 	(revision )
@@ -1,127 +1,0 @@
-# Genesis config yaml style
-# vim:ts=2:et:sw=2:ai
-#
-board     : "ALIX2"
-gateway   : "213.125.99.233"
-latitude  : "52.16476"
-location  : "Visitor Centre Leiden, Stationsweg 26, 2312AT Leiden"
-longitude : "4.48388"
-masterip  : "172.17.87.1"
-monitoring_group: "wleiden"
-nodename  : "VisitorCentre"
-nodetype  : "Hybrid"
-portal_sponsor: "Visitor Centre Leiden"
-portal_url: "http://portal.leiden.nl/"
-rdnap_x   : 93196
-rdnap_y   : 464451
-rdr_host  : "213.125.99.237"
-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', 9090, '172.17.2.67', 80]
-- ['tcp', 9091, '172.16.9.237', 88]
-- ['tcp', 9092, '172.17.51.5', 80]
-- ['tcp', 9093, '172.16.3.142', 8080]
-- ['tcp', 9094, '172.17.20.5', 80]
-- ['tcp', 9095, '172.17.20.5', 554]
-- ['tcp', 9096, '172.17.13.66', 88]
-- ['tcp', 9097, '172.16.3.190', 8080]
-- ['tcp', 9098, '172.16.3.134', 8080]
-- ['tcp', 43389, '172.17.0.45', 3389]
-release   : "9.0-RELEASE"
-service_accesspoint: True
-service_concentrator: False
-service_incoming_rdr: True
-service_proxy_ileiden: True
-service_proxy_normal: True
-status    : "down"
-
-
-iface_ath0:
-  comment    : "PA4040 voor Stationsweg"
-  ip         : "172.17.88.1/24"
-  sdesc      : "2apzo"
-  mode       : "ap"
-  type       : "11g"
-  channel    : 1
-  ssid       : "WiFi-Leiden"
-  wlan_mac   : "00:1b:b1:00:ec:94"
-  dhcp       : "10-240"
-  status     : "up"
-
-iface_ue0:
-  comment    : "Ap-zuidwest sectorantenne 120 graden kabel 3"
-  ip         : "172.17.87.1/24"
-  sdesc      : "2apzw"
-  mode       : "ap"
-  type       : "eth"
-  extra_type : "eth2wifibridge"
-  channel    : "11"
-  ssid       : "WiFi-Leiden"
-  dhcp       : "10-240"
-  ns_ip      : "172.17.87.2/24"
-  ns_mac     : "dc:9f:db:0c:30:2a"
-  bridge_type: "RocketM2"
-  status     : "up"
-
-iface_vr0:
-  comment    : "Link naar DeKijker"
-  ip         : "172.16.5.188/29"
-  sdesc      : "2kijker"
-  type       : "eth"
-  extra_type : "eth2wifibridge"
-  channel    : ""
-  ssid       : "il-zzo.dekijker.wleiden.net"
-  dhcp       : False
-  compass    : "nnw"
-  ns_ip      : "172.16.5.187"
-  ns_mac     : ""
-  bridge_type: "NanoStation5M"
-  status     : "up"
-
-iface_vr0_alias0:
-  comment    : "Uplink"
-  ip         : "213.125.99.237/29"
-  sdesc      : "uplink"
-  type       : "eth"
-  dhcp       : False
-  status     : "up"
-
-iface_vr1:
-  comment    : "Link naar Cope kabel 1"
-  ip         : "172.16.7.57/29"
-  sdesc      : "2zuid"
-  mode       : "ap-wds"
-  type       : "eth"
-  extra_type : "eth2wifibridge"
-  channel    : "136"
-  ssid       : "il-z.visitorcentre2.wleiden.net"
-  dhcp       : False
-  compass    : "z"
-  ns_ip      : "172.16.7.58/29"
-  ns_mac     : "dc:9f:db:2e:0a:a6"
-  bridge_type: "NanoBridgeM5"
-  status     : "up"
-
-iface_vr2:
-  comment    : "Link naar Oost kabel 2"
-  ip         : "172.16.6.161/29"
-  sdesc      : "2oost"
-  mode       : "ap-wds"
-  type       : "eth"
-  channel    : "52"
-  ssid       : "il-o.visitorcentre2.wleiden.net"
-  dhcp       : False
-  compass    : "o"
-  ns_ip      : "172.16.6.162/29"
-  ns_mac     : "dc:9f:db:2e:0b:01"
-  bridge_type: "NanoBridgeM5"
-  status     : "up"
-
-
