Add location information to tile caches

diff --git a/roles/blix-nl.rb b/roles/blix-nl.rb
index 1c81d09f52f39d7ab31079c736e878ff74ce887d..936694b1c9fb25e34a9c6b01b8517e5d7dbbed69 100644 (file)
--- a/roles/blix-nl.rb
+++ b/roles/blix-nl.rb
@@ -1,6 +1,10 @@
 name "blix-nl"
 description "Role applied to all servers at Blix NL"
 
 name "blix-nl"
 description "Role applied to all servers at Blix NL"
 

+default_attributes(
+  :location => "Amsterdam, Netherlands"
+)
+

 override_attributes(
   :ntp => {
     :servers => ["0.nl.pool.ntp.org", "1.nl.pool.ntp.org", "europe.pool.ntp.org"]
 override_attributes(
   :ntp => {
     :servers => ["0.nl.pool.ntp.org", "1.nl.pool.ntp.org", "europe.pool.ntp.org"]

diff --git a/roles/blix-no.rb b/roles/blix-no.rb
index ad67234f5bc9c7e55273af0de2d0b8f98717dc89..b4ed5cddc38b21426b33c789103162b00e95b8fb 100644 (file)
--- a/roles/blix-no.rb
+++ b/roles/blix-no.rb
@@ -1,6 +1,10 @@
 name "blix-no"
 description "Role applied to all servers at Blix NO"
 
 name "blix-no"
 description "Role applied to all servers at Blix NO"
 

+default_attributes(
+  :location => "Oslo, Norway"
+)
+

 override_attributes(
   :ntp => {
     :servers => ["0.no.pool.ntp.org", "1.no.pool.ntp.org", "europe.pool.ntp.org"]
 override_attributes(
   :ntp => {
     :servers => ["0.no.pool.ntp.org", "1.no.pool.ntp.org", "europe.pool.ntp.org"]

diff --git a/roles/bluehost.rb b/roles/bluehost.rb
index 5e4f4466319cba100cff786014f8734e1b8fc642..92034f9c9b29c1a6299a76dfe6b0a1f956c02d7c 100644 (file)
--- a/roles/bluehost.rb
+++ b/roles/bluehost.rb
@@ -2,6 +2,7 @@ name "bluehost"
 description "Role applied to all servers at Bluehost"
 
 default_attributes(
 description "Role applied to all servers at Bluehost"
 
 default_attributes(

+  :location => "Provo, Utah",

   :networking => {
     :nameservers => ["8.8.8.8", "8.8.4.4"],
     :roles => {
   :networking => {
     :nameservers => ["8.8.8.8", "8.8.4.4"],
     :roles => {

diff --git a/roles/datahata.rb b/roles/datahata.rb
index b384a4cb70b62f7969cef66684000b0f4cba1c38..965424cad2f0ea1c38d743ff5dd1d0f594391350 100644 (file)
--- a/roles/datahata.rb
+++ b/roles/datahata.rb
@@ -7,6 +7,7 @@ default_attributes(
       :kom => { :status => :administrator }
     }
   },
       :kom => { :status => :administrator }
     }
   },

+  :location => "Minsk, Belarus",

   :networking => {
     :nameservers => [
       "31.130.200.2"
   :networking => {
     :nameservers => [
       "31.130.200.2"

diff --git a/roles/delta.rb b/roles/delta.rb
index 000500061e608915be83d0fe08c71f5d4ba8cf0f..8503e8218868d53279ce10c2d050cf629f5a3593 100644 (file)
--- a/roles/delta.rb
+++ b/roles/delta.rb
@@ -2,6 +2,7 @@ name "delta"
 description "Role applied to all servers at Delta Telecom"
 
 default_attributes(
 description "Role applied to all servers at Delta Telecom"
 
 default_attributes(

+  :location => "Baku, Azerbaijan",

   :networking => {
     :nameservers => ["94.20.20.20", "8.8.8.8", "8.8.4.4"],
     :roles => {
   :networking => {
     :nameservers => ["94.20.20.20", "8.8.8.8", "8.8.4.4"],
     :roles => {

diff --git a/roles/drogon.rb b/roles/drogon.rb
index 7684bb4cdfb398dd82dd4d5509b0305e716c76cc..4daecc41b31d8684156357e0c08c60fe7c7af68b 100644 (file)
--- a/roles/drogon.rb
+++ b/roles/drogon.rb
@@ -7,6 +7,7 @@ default_attributes(
       :zelja => { :status => :administrator }
     }
   },
       :zelja => { :status => :administrator }
     }
   },

+  :location => "Osijek, Croatia",

   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {


@@ -36,7 +37,7 @@ default_attributes(
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {
     :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {

-    :tile_parent => "pula.render.openstreetmap.org",
+    :tile_parent => "osijek.render.openstreetmap.org",

     :tile_siblings => [
       "viserion.openstreetmap.org"
     ]
     :tile_siblings => [
       "viserion.openstreetmap.org"
     ]

diff --git a/roles/euserv.rb b/roles/euserv.rb
index 5722f8d8dfda0c7bf859e0e5f92f6eec74e56509..7bf9c436314762a4c828dba4eacea42530419b9f 100644 (file)
--- a/roles/euserv.rb
+++ b/roles/euserv.rb
@@ -2,6 +2,7 @@ name "euserv"
 description "Role applied to all servers at EUserv"
 
 default_attributes(
 description "Role applied to all servers at EUserv"
 
 default_attributes(

+  :location => "Jena, Germany",

   :networking => {
     :nameservers => [
       "85.31.184.60", "85.31.184.61", "85.31.185.60", "85.31.185.61"
   :networking => {
     :nameservers => [
       "85.31.184.60", "85.31.184.61", "85.31.185.60", "85.31.185.61"

diff --git a/roles/hetzner.rb b/roles/hetzner.rb
index 8a9e0afd83bfb98d57bdedee43edd60ccf442119..0231ca0a7fd69afa98e17938c27f6910825c88b1 100644 (file)
--- a/roles/hetzner.rb
+++ b/roles/hetzner.rb
@@ -2,6 +2,7 @@ name "hetzner"
 description "Role applied to all servers at Hetzner"
 
 default_attributes(
 description "Role applied to all servers at Hetzner"
 
 default_attributes(

+  :location => "Falkenstein, Germany",

   :networking => {
     :nameservers => [
       "213.133.98.98",
   :networking => {
     :nameservers => [
       "213.133.98.98",

diff --git a/roles/lyonix.rb b/roles/lyonix.rb
index c19b0339e7208c197b20740a36fa7c3e02dab862..416d3971c33d446c3647dc18ea569ecc0309febf 100644 (file)
--- a/roles/lyonix.rb
+++ b/roles/lyonix.rb
@@ -7,6 +7,7 @@ default_attributes(
       :lyonix => { :status => :administrator }
     }
   },
       :lyonix => { :status => :administrator }
     }
   },

+  :location => "Lyon, France",

   :networking => {
     :nameservers => ["77.95.64.205", "77.95.64.206", "8.8.8.8", "8.8.4.4"],
     :roles => {
   :networking => {
     :nameservers => ["77.95.64.205", "77.95.64.206", "8.8.8.8", "8.8.4.4"],
     :roles => {

diff --git a/roles/nchc.rb b/roles/nchc.rb
index 1e4cd5f0a4a2bcf88607c473c6e4c73234027683..62639e7840fad656e68d1431c9b0e2d76f082da3 100644 (file)
--- a/roles/nchc.rb
+++ b/roles/nchc.rb
@@ -8,6 +8,7 @@ default_attributes(
       :ceasar => { :status => :administrator }
     }
   },
       :ceasar => { :status => :administrator }
     }
   },

+  :location => "Hsinchu, Taiwan",

   :networking => {
     :nameservers => ["8.8.8.8", "8.8.4.4"],
     :roles => {
   :networking => {
     :nameservers => ["8.8.8.8", "8.8.4.4"],
     :roles => {

diff --git a/roles/osuosl.rb b/roles/osuosl.rb
index e68f0c5359a398c06f75cc77e683d2f1ebd87c19..4f2b61c117923dbe2c4c845ea16afa374234c3f5 100644 (file)
--- a/roles/osuosl.rb
+++ b/roles/osuosl.rb
@@ -7,6 +7,7 @@ default_attributes(
       :osuadmin => { :status => :administrator }
     }
   },
       :osuadmin => { :status => :administrator }
     }
   },

+  :location => "Corvallis, Oregon",

   :networking => {
     :nameservers => ["8.8.8.8", "8.8.4.4"],
     :roles => {
   :networking => {
     :nameservers => ["8.8.8.8", "8.8.4.4"],
     :roles => {

diff --git a/roles/paulla.rb b/roles/paulla.rb
index cc128c4777e97218fb369b1aaae0c7354cc8c65c..ad3fcd8f7f658b1500706efc55931fc11878aeaf 100644 (file)
--- a/roles/paulla.rb
+++ b/roles/paulla.rb
@@ -8,6 +8,7 @@ default_attributes(
       :jpcw => { :status => :administrator }
     }
   },
       :jpcw => { :status => :administrator }
     }
   },

+  :location => "Pau, France",

   :munin => {
     :allow => ["10.64.1.11"]
   },
   :munin => {
     :allow => ["10.64.1.11"]
   },

diff --git a/roles/prgmr.rb b/roles/prgmr.rb
index 7803ff3a67d71de840f6626c76a59617bf85a670..cb060620f09bedcf52a7fbb674f64df89dace920 100644 (file)
--- a/roles/prgmr.rb
+++ b/roles/prgmr.rb
@@ -2,6 +2,7 @@ name "prgmr"
 description "Role applied to all servers at prgmr.com"
 
 default_attributes(
 description "Role applied to all servers at prgmr.com"
 
 default_attributes(

+  :location => "San Francisco, California",

   :networking => {
     :nameservers => ["8.8.4.4", "65.19.174.2", "65.19.175.2"],
     :roles => {
   :networking => {
     :nameservers => ["8.8.4.4", "65.19.174.2", "65.19.175.2"],
     :roles => {

diff --git a/roles/sarkany.rb b/roles/sarkany.rb
index 75fe63b3b6cf75a129fb0bfea941be054e194c09..30b7afab76d42517af834a775b0e254f286a4ca2 100644 (file)
--- a/roles/sarkany.rb
+++ b/roles/sarkany.rb
@@ -27,7 +27,7 @@ default_attributes(
     :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {
     :cache_dir => "coss /store/squid/coss-01 80000 block-size=8192 max-size=262144 membufs=80"
   },
   :tilecache => {

-    :tile_parent => "london.render.openstreetmap.org",
+    :tile_parent => "budapest.render.openstreetmap.org",

     :tile_siblings => [
       "trogdor.openstreetmap.org",
       "katie.openstreetmap.org",
     :tile_siblings => [
       "trogdor.openstreetmap.org",
       "katie.openstreetmap.org",

diff --git a/roles/szerverem.rb b/roles/szerverem.rb
index 8ac2847931f7ee1f5cc53be6ed4c498cf0d0c39b..a15c7caad91009e99fa9c52ec1369abdc61cc740 100644 (file)
--- a/roles/szerverem.rb
+++ b/roles/szerverem.rb
@@ -2,6 +2,7 @@ name "szerverem"
 description "Role applied to all servers at szerverem.hu"
 
 default_attributes(
 description "Role applied to all servers at szerverem.hu"
 
 default_attributes(

+  :location => "Budapest, Hungary",

   :networking => {
     :nameservers => [
       "8.8.8.8",
   :networking => {
     :nameservers => [
       "8.8.8.8",

diff --git a/roles/teleservice.rb b/roles/teleservice.rb
index c1e09aed013864d9eeb1d4207a84f1a574213dbc..6d9d19ab9faf69d1f9a86706f13c50bd7e18b4cb 100644 (file)
--- a/roles/teleservice.rb
+++ b/roles/teleservice.rb
@@ -1,7 +1,9 @@
+# coding: utf-8

 name "teleservice"
 description "Role applied to all servers at Teleservice"
 
 default_attributes(
 name "teleservice"
 description "Role applied to all servers at Teleservice"
 
 default_attributes(

+  :location => "Sjöbo, Sweden",

   :networking => {
     :nameservers => ["8.8.8.8", "8.8.4.4"],
     :roles => {
   :networking => {
     :nameservers => ["8.8.8.8", "8.8.4.4"],
     :roles => {

diff --git a/roles/ucl.rb b/roles/ucl.rb
index 842daad985013736a262dea9cf82d5c37cfdb6e1..2dd44ee70d741166cc08181046523a06a58ec477 100644 (file)
--- a/roles/ucl.rb
+++ b/roles/ucl.rb
@@ -4,7 +4,8 @@ description "Role applied to all servers at UCL"
 default_attributes(
   :bind => {
     :forwarders => ["144.82.100.1", "144.82.100.41"]
 default_attributes(
   :bind => {
     :forwarders => ["144.82.100.1", "144.82.100.41"]

-  }
+  },
+  :location => "London, England"

 )
 
 override_attributes(
 )
 
 override_attributes(

diff --git a/roles/viserion.rb b/roles/viserion.rb
index 8686fbfba230a981ad24093691dafe749670e505..9d16f3b7cfd38d6b2201cf6a54e0e558b5cb27f3 100644 (file)
--- a/roles/viserion.rb
+++ b/roles/viserion.rb
@@ -7,6 +7,7 @@ default_attributes(
       :anovak => { :status => :administrator }
     }
   },
       :anovak => { :status => :administrator }
     }
   },

+  :location => "Pula, Croatia",

   :munin => {
     :allow => ["193.198.233.210"]
   },
   :munin => {
     :allow => ["193.198.233.210"]
   },

diff --git a/roles/yandex.rb b/roles/yandex.rb
index 2c9c89b02151437f40e9435e7d8203cf70419477..c581d84f58acf0392b9011da8edf246ab124bf75 100644 (file)
--- a/roles/yandex.rb
+++ b/roles/yandex.rb
@@ -2,6 +2,7 @@ name "yandex"
 description "Role applied to all servers at Yandex"
 
 default_attributes(
 description "Role applied to all servers at Yandex"
 
 default_attributes(

+  :location => "Moscow, Russia",

   :networking => {
     :nameservers => ["8.8.8.8", "8.8.4.4"],
     :roles => {
   :networking => {
     :nameservers => ["8.8.8.8", "8.8.4.4"],
     :roles => {