From e7700a052e1494d3a3ccd18445b18bf43a43d6b1 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 27 Jan 2016 19:05:21 +0000 Subject: [PATCH] Add location information to tile caches --- roles/blix-nl.rb | 4 ++++ roles/blix-no.rb | 4 ++++ roles/bluehost.rb | 1 + roles/datahata.rb | 1 + roles/delta.rb | 1 + roles/drogon.rb | 3 ++- roles/euserv.rb | 1 + roles/hetzner.rb | 1 + roles/lyonix.rb | 1 + roles/nchc.rb | 1 + roles/osuosl.rb | 1 + roles/paulla.rb | 1 + roles/prgmr.rb | 1 + roles/sarkany.rb | 2 +- roles/szerverem.rb | 1 + roles/teleservice.rb | 2 ++ roles/ucl.rb | 3 ++- roles/viserion.rb | 1 + roles/yandex.rb | 1 + 19 files changed, 28 insertions(+), 3 deletions(-) diff --git a/roles/blix-nl.rb b/roles/blix-nl.rb index 1c81d09f5..936694b1c 100644 --- 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" +default_attributes( + :location => "Amsterdam, Netherlands" +) + 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 ad67234f5..b4ed5cddc 100644 --- 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" +default_attributes( + :location => "Oslo, Norway" +) + 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 5e4f44663..92034f9c9 100644 --- a/roles/bluehost.rb +++ b/roles/bluehost.rb @@ -2,6 +2,7 @@ name "bluehost" description "Role applied to all servers at Bluehost" default_attributes( + :location => "Provo, Utah", :networking => { :nameservers => ["8.8.8.8", "8.8.4.4"], :roles => { diff --git a/roles/datahata.rb b/roles/datahata.rb index b384a4cb7..965424cad 100644 --- a/roles/datahata.rb +++ b/roles/datahata.rb @@ -7,6 +7,7 @@ default_attributes( :kom => { :status => :administrator } } }, + :location => "Minsk, Belarus", :networking => { :nameservers => [ "31.130.200.2" diff --git a/roles/delta.rb b/roles/delta.rb index 000500061..8503e8218 100644 --- 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( + :location => "Baku, Azerbaijan", :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 7684bb4cd..4daecc41b 100644 --- a/roles/drogon.rb +++ b/roles/drogon.rb @@ -7,6 +7,7 @@ default_attributes( :zelja => { :status => :administrator } } }, + :location => "Osijek, Croatia", :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 => { - :tile_parent => "pula.render.openstreetmap.org", + :tile_parent => "osijek.render.openstreetmap.org", :tile_siblings => [ "viserion.openstreetmap.org" ] diff --git a/roles/euserv.rb b/roles/euserv.rb index 5722f8d8d..7bf9c4363 100644 --- a/roles/euserv.rb +++ b/roles/euserv.rb @@ -2,6 +2,7 @@ name "euserv" 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" diff --git a/roles/hetzner.rb b/roles/hetzner.rb index 8a9e0afd8..0231ca0a7 100644 --- a/roles/hetzner.rb +++ b/roles/hetzner.rb @@ -2,6 +2,7 @@ name "hetzner" description "Role applied to all servers at Hetzner" default_attributes( + :location => "Falkenstein, Germany", :networking => { :nameservers => [ "213.133.98.98", diff --git a/roles/lyonix.rb b/roles/lyonix.rb index c19b0339e..416d3971c 100644 --- a/roles/lyonix.rb +++ b/roles/lyonix.rb @@ -7,6 +7,7 @@ default_attributes( :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 => { diff --git a/roles/nchc.rb b/roles/nchc.rb index 1e4cd5f0a..62639e784 100644 --- a/roles/nchc.rb +++ b/roles/nchc.rb @@ -8,6 +8,7 @@ default_attributes( :ceasar => { :status => :administrator } } }, + :location => "Hsinchu, Taiwan", :networking => { :nameservers => ["8.8.8.8", "8.8.4.4"], :roles => { diff --git a/roles/osuosl.rb b/roles/osuosl.rb index e68f0c535..4f2b61c11 100644 --- a/roles/osuosl.rb +++ b/roles/osuosl.rb @@ -7,6 +7,7 @@ default_attributes( :osuadmin => { :status => :administrator } } }, + :location => "Corvallis, Oregon", :networking => { :nameservers => ["8.8.8.8", "8.8.4.4"], :roles => { diff --git a/roles/paulla.rb b/roles/paulla.rb index cc128c477..ad3fcd8f7 100644 --- a/roles/paulla.rb +++ b/roles/paulla.rb @@ -8,6 +8,7 @@ default_attributes( :jpcw => { :status => :administrator } } }, + :location => "Pau, France", :munin => { :allow => ["10.64.1.11"] }, diff --git a/roles/prgmr.rb b/roles/prgmr.rb index 7803ff3a6..cb060620f 100644 --- 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( + :location => "San Francisco, California", :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 75fe63b3b..30b7afab7 100644 --- 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 => { - :tile_parent => "london.render.openstreetmap.org", + :tile_parent => "budapest.render.openstreetmap.org", :tile_siblings => [ "trogdor.openstreetmap.org", "katie.openstreetmap.org", diff --git a/roles/szerverem.rb b/roles/szerverem.rb index 8ac284793..a15c7caad 100644 --- 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( + :location => "Budapest, Hungary", :networking => { :nameservers => [ "8.8.8.8", diff --git a/roles/teleservice.rb b/roles/teleservice.rb index c1e09aed0..6d9d19ab9 100644 --- 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( + :location => "Sjöbo, Sweden", :networking => { :nameservers => ["8.8.8.8", "8.8.4.4"], :roles => { diff --git a/roles/ucl.rb b/roles/ucl.rb index 842daad98..2dd44ee70 100644 --- 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"] - } + }, + :location => "London, England" ) override_attributes( diff --git a/roles/viserion.rb b/roles/viserion.rb index 8686fbfba..9d16f3b7c 100644 --- a/roles/viserion.rb +++ b/roles/viserion.rb @@ -7,6 +7,7 @@ default_attributes( :anovak => { :status => :administrator } } }, + :location => "Pula, Croatia", :munin => { :allow => ["193.198.233.210"] }, diff --git a/roles/yandex.rb b/roles/yandex.rb index 2c9c89b02..c581d84f5 100644 --- a/roles/yandex.rb +++ b/roles/yandex.rb @@ -2,6 +2,7 @@ name "yandex" description "Role applied to all servers at Yandex" default_attributes( + :location => "Moscow, Russia", :networking => { :nameservers => ["8.8.8.8", "8.8.4.4"], :roles => { -- 2.39.5