imagery: let templates expand [abc]. domain

diff --git a/cookbooks/imagery/recipes/au_agri.rb b/cookbooks/imagery/recipes/au_agri.rb
index e3cc9fce8f542895bd1ec2f6a2c64618b244ef1a..fd16061730bb37941f9a83022190f40c074374a5 100644 (file)
--- a/cookbooks/imagery/recipes/au_agri.rb
+++ b/cookbooks/imagery/recipes/au_agri.rb
@@ -21,7 +21,6 @@ include_recipe "imagery"
 
 imagery_site "agri.openstreetmap.org" do
   title "OpenStreetMap - The Australian Geographic Reference Image"
 
 imagery_site "agri.openstreetmap.org" do
   title "OpenStreetMap - The Australian Geographic Reference Image"

-  aliases ["a.agri.openstreetmap.org", "b.agri.openstreetmap.org", "c.agri.openstreetmap.org"]

   bbox [[-44.74673, 111.5332], [-9.75237, 154.6875]]
 end
 
   bbox [[-44.74673, 111.5332], [-9.75237, 154.6875]]
 end
 

diff --git a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
index 99f381d5167a7a3eaa07ef1d0d6b3b63d80c7452..8f304c88b2b88976862f515a252eaa1fdc449c9d 100644 (file)
--- a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
@@ -21,7 +21,6 @@ include_recipe "imagery"
 
 imagery_site "hampshire.aerial.openstreetmap.org.uk" do
   title "OpenStreetMap - Hampshire Hub Aerial"
 
 imagery_site "hampshire.aerial.openstreetmap.org.uk" do
   title "OpenStreetMap - Hampshire Hub Aerial"

-  aliases ["a.hampshire.aerial.openstreetmap.org.uk", "b.hampshire.aerial.openstreetmap.org.uk", "c.hampshire.aerial.openstreetmap.org.uk"]

   bbox [[50.68993, -1.97823], [51.39492, -0.70724]]
 end
 
   bbox [[50.68993, -1.97823], [51.39492, -0.70724]]
 end
 

diff --git a/cookbooks/imagery/recipes/gb_os_sv.rb b/cookbooks/imagery/recipes/gb_os_sv.rb
index 7b99213ad71d2c42a716445daddbc76e63756469..83b4de2100ef8ed6c0f0c36940f15b9c6add28cb 100644 (file)
--- a/cookbooks/imagery/recipes/gb_os_sv.rb
+++ b/cookbooks/imagery/recipes/gb_os_sv.rb
@@ -43,7 +43,7 @@ end
 
 imagery_site "os.openstreetmap.org" do
   title "OpenStreetMap - Ordnance Survey OpenData - Street View"
 
 imagery_site "os.openstreetmap.org" do
   title "OpenStreetMap - Ordnance Survey OpenData - Street View"

-  aliases ["os.openstreetmap.org", "a.os.openstreetmap.org", "b.os.openstreetmap.org", "c.os.openstreetmap.org", "os.openstreetmap.org.uk", "a.os.openstreetmap.org.uk", "b.os.openstreetmap.org.uk", "c.os.openstreetmap.org.uk"]
+  aliases ["os.openstreetmap.org.uk"]

   bbox [[49.85, -10.5], [58.75, 1.9]]
 end
 
   bbox [[49.85, -10.5], [58.75, 1.9]]
 end
 

diff --git a/cookbooks/imagery/recipes/gb_surrey_aerial.rb b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
index 1608dd93c20c628e327a4cae64b6b79fc7a65d97..1ea762715780749528f74665d7d4dd5647ac578c 100644 (file)
--- a/cookbooks/imagery/recipes/gb_surrey_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_surrey_aerial.rb
@@ -21,7 +21,6 @@ include_recipe "imagery"
 
 imagery_site "surrey.aerial.openstreetmap.org.uk" do
   title "OpenStreetMap - Surrey Air Survey - 2009"
 
 imagery_site "surrey.aerial.openstreetmap.org.uk" do
   title "OpenStreetMap - Surrey Air Survey - 2009"

-  aliases ["a.surrey.aerial.openstreetmap.org.uk", "b.surrey.aerial.openstreetmap.org.uk", "c.surrey.aerial.openstreetmap.org.uk"]

   bbox [[51.06686, -0.85762], [51.47753, 0.06592]]
 end
 
   bbox [[51.06686, -0.85762], [51.47753, 0.06592]]
 end
 

diff --git a/cookbooks/imagery/resources/layer.rb b/cookbooks/imagery/resources/layer.rb
index d66440b93d0d6423649d247b610df6e74b62562e..46b584e1db3214298474b6f7f95cacbcc6f250b1 100644 (file)
--- a/cookbooks/imagery/resources/layer.rb
+++ b/cookbooks/imagery/resources/layer.rb
@@ -52,7 +52,7 @@ action :create do
     end
     content YAML.dump(:name => layer,
                       :title => title || layer,
     end
     content YAML.dump(:name => layer,
                       :title => title || layer,

-                      :url => "http://#{site}/layer/#{layer}/{z}/{x}/{y}.png",
+                      :url => "http://{s}.#{site}/layer/#{layer}/{z}/{x}/{y}.png",

                       :attribution => copyright,
                       :default => default_layer,
                       :maxZoom => max_zoom)
                       :attribution => copyright,
                       :default => default_layer,
                       :maxZoom => max_zoom)

diff --git a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
index 42994a6fca9f5c87797f35ebdd6f67eb61b82761..1e9415825bf931d71bb3bef26633502c129cad9d 100644 (file)
--- a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
+++ b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
@@ -1,6 +1,6 @@
 server {
     listen       80;
 server {
     listen       80;

-    server_name  <%= @name %> a.<%= @name %> b.<%= @name %> c.<%= @name %><% @aliases.each do |alias_name| %> <%= alias_name %><%- end -%>;
+    server_name  <%= @name %> a.<%= @name %> b.<%= @name %> c.<%= @name %><% @aliases.each do |alias_name| %> <%= alias_name %> a.<%= alias_name %> b.<%= alias_name %> c.<%= alias_name %><%- end -%>;

 
     root "/srv/<%= @name %>";
 
 
     root "/srv/<%= @name %>";