imagery: let templates expand [abc]. domain

[chef.git] / cookbooks / imagery / recipes / gb_os_sv.rb

diff --git a/cookbooks/imagery/recipes/gb_os_sv.rb b/cookbooks/imagery/recipes/gb_os_sv.rb
index 2507c4285fd3e137d47fc313f6314885ce9e0cc5..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"
-  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
 
@@ -299,36 +299,36 @@ imagery_layer "gb_os_sv_diff_2010_04_2015_05" do
   overlay true
 end
 
-# imagery_layer "gb_os_sv_diff_2010_04_2015_11" do
-#   site "os.openstreetmap.org"
-#   projection "EPSG:27700"
-#   source "/data/imagery/gb/os-sv/ossv-diff-2010-04-2015-11-combined.vrt"
-#   copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
-#   extension "os_sv_diff_png"
-#   url_aliases ["/sv-diff-2010-04-2015-11"]
-#   overlay true
-# end
-#
-# imagery_layer "gb_os_sv_diff_2010_04_2016_04" do
-#   site "os.openstreetmap.org"
-#   projection "EPSG:27700"
-#   source "/data/imagery/gb/os-sv/ossv-diff-2010-04-2016-04-combined.vrt"
-#   copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
-#   extension "os_sv_diff_png"
-#   url_aliases ["/sv-diff-2010-04-2016-04"]
-#   overlay true
-# end
-#
-# imagery_layer "gb_os_sv_diff_2010_11_2011_05" do
-#   site "os.openstreetmap.org"
-#   projection "EPSG:27700"
-#   source "/data/imagery/gb/os-sv/ossv-diff-2010-11-2011-05-combined.vrt"
-#   copyright "Contains Ordnance Survey data © Crown copyright and database right 2011"
-#   extension "os_sv_diff_png"
-#   url_aliases ["/sv-diff-2010-11-2011-05"]
-#   overlay true
-# end
-#
+imagery_layer "gb_os_sv_diff_2010_04_2015_11" do
+  site "os.openstreetmap.org"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/os-sv/ossv-diff-2010-04-2015-11-combined.vrt"
+  copyright "Contains Ordnance Survey data © Crown copyright and database right 2015"
+  extension "os_sv_diff_png"
+  url_aliases ["/sv-diff-2010-04-2015-11"]
+  overlay true
+end
+
+imagery_layer "gb_os_sv_diff_2010_04_2016_04" do
+  site "os.openstreetmap.org"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/os-sv/ossv-diff-2010-04-2016-04-combined.vrt"
+  copyright "Contains Ordnance Survey data © Crown copyright and database right 2016"
+  extension "os_sv_diff_png"
+  url_aliases ["/sv-diff-2010-04-2016-04"]
+  overlay true
+end
+
+imagery_layer "gb_os_sv_diff_2010_11_2011_05" do
+  site "os.openstreetmap.org"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/os-sv/ossv-diff-2010-11-2011-05-combined.vrt"
+  copyright "Contains Ordnance Survey data © Crown copyright and database right 2011"
+  extension "os_sv_diff_png"
+  url_aliases ["/sv-diff-2010-11-2011-05"]
+  overlay true
+end
+
 # imagery_layer "gb_os_sv_diff_2010_11_2011_11" do
 #   site "os.openstreetmap.org"
 #   projection "EPSG:27700"