Imagery - Add site alias support

diff --git a/cookbooks/imagery/recipes/au_agri.rb b/cookbooks/imagery/recipes/au_agri.rb
index 17462d0b8b86c37f84866118909ba2c9e50c5d3d..dc9258fc2390ba333e2e86060493b35ac488b3b1 100644 (file)
--- a/cookbooks/imagery/recipes/au_agri.rb
+++ b/cookbooks/imagery/recipes/au_agri.rb
@@ -20,7 +20,7 @@
 include_recipe "imagery"
 
 imagery_site "agri.openstreetmap.org" do
-  # aliases ["agri.openstreetmap.org.au"]
+  aliases [ "agri.openstreetmap.org.au" ]
 end
 
 imagery_layer "au_ga_agri" do

diff --git a/cookbooks/imagery/recipes/gb_os_sv.rb b/cookbooks/imagery/recipes/gb_os_sv.rb
index 5d634018010a13dc024b8138ce47be9c66f77567..6f3e75651631e27b327e1c72bd7eb6ffce0c9419 100644 (file)
--- a/cookbooks/imagery/recipes/gb_os_sv.rb
+++ b/cookbooks/imagery/recipes/gb_os_sv.rb
@@ -27,7 +27,7 @@ cookbook_file "/srv/imagery/common/ossv-palette.txt" do
 end
 
 imagery_site "os.openstreetmap.org" do
-  # aliases ["os.openstreetmap.org.uk"]
+  aliases [ "os.openstreetmap.org.uk" ]
 end
 
 imagery_layer "gb_os_sv_2010_04" do

diff --git a/cookbooks/imagery/resources/site.rb b/cookbooks/imagery/resources/site.rb
index 3edeb90385e03ef41807a17b188ce9057206d42b..88b122097753bd5afe9e50b079a555eeeec1d76a 100644 (file)
--- a/cookbooks/imagery/resources/site.rb
+++ b/cookbooks/imagery/resources/site.rb
@@ -20,9 +20,10 @@
 default_action :create
 
 property :name, String
+property :aliases, [String, Array], :default => []
 
 action :create do
-  directory "/srv/imagery/#{name}" do
+  directory "/srv/#{name}" do
     owner "root"
     group "root"
     mode 0755

diff --git a/cookbooks/imagery/templates/default/nginx_imagery.conf.erb b/cookbooks/imagery/templates/default/nginx_imagery.conf.erb
index fa3fdd7bb95b84515b246b060107f508f80edcda..30bcd0740abb9fa456f721534842a840be0d514a 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_name  <%= @name %>;
+    server_name  <%= @name %> a.<%= @name %> b.<%= @name %> c.<%= @name %><% @aliases.each do |alias_name| %> <%= alias_name %><%- end -%>;
 
     # Include site imagery layers
     include /srv/imagery/nginx/<%= @name %>/layer-*.conf;