imagery: use nginx upstream round-robin instead of least_conn

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

diff --git a/cookbooks/imagery/recipes/za_coct_aerial.rb b/cookbooks/imagery/recipes/za_coct_aerial.rb
index 45d246b0559b08fa40940d50e45ff4527bb7a425..25948df4cc363dcf450ac5015c1316cfa5563631 100644 (file)
--- a/cookbooks/imagery/recipes/za_coct_aerial.rb
+++ b/cookbooks/imagery/recipes/za_coct_aerial.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -37,18 +37,14 @@ imagery_layer "za_coct_aerial_2015" do
   max_zoom 21
 end
 
-imagery_layer "za_coct_aerial_2015_hart94" do
-  action :delete
-  site "coct.aerial.openstreetmap.org.za"
-  source "/data/imagery/za/coct/2015-hart94-epsg-3857.tif"
-end
-
 imagery_layer "za_coct_aerial_2013" do
-  action :delete
-  #   projection "EPSG:3857"
+  projection "EPSG:3857"
   site "coct.aerial.openstreetmap.org.za"
-  #   title "City of Cape Town Aerial - 2013 (OSM USE ONLY)"
-  source "/data/imagery/za/coct/2013-tif-epsg-3857.vrt"
-  #   copyright 'Copyright &copy; 2013 <a href="https://www.capetown.gov.za/">City of Cape Town</a>'
-  #   max_zoom 21
+  title "City of Cape Town Aerial - 2013 (OSM USE ONLY)"
+  source "/data/imagery/za/coct/2013-epsg-3857.tif"
+  copyright 'Copyright &copy; 2013 <a href="https://www.capetown.gov.za/">City of Cape Town</a>'
+  background_colour "0 0 0"
+  extension "jpeg"
+  max_zoom 21
+  revision 2
 end