Switch to using upstream builds for prometheus and alertmanager

[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 fb867b6d3e1a6e5ed17c59d8009e6841d668870f..70463798f2bda0cdaf321b8fd18d65fae8228538 100644 (file)
--- a/cookbooks/imagery/recipes/za_coct_aerial.rb
+++ b/cookbooks/imagery/recipes/za_coct_aerial.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: imagery
+# Cookbook:: imagery
 # Recipe:: za_coct_aerial
 #
-# Copyright 2016, OpenStreetMap Foundation
+# Copyright:: 2016, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,22 +37,14 @@ imagery_layer "za_coct_aerial_2015" do
   max_zoom 21
 end
 
-imagery_layer "za_coct_aerial_2015_hart94" do
+imagery_layer "za_coct_aerial_2013" do
   projection "EPSG:3857"
   site "coct.aerial.openstreetmap.org.za"
-  title "City of Cape Town Aerial - 2015 (Hart94 Reproj) (OSM USE ONLY)"
-  source "/data/imagery/za/coct/2015-hart94-epsg-3857.tif"
-  copyright 'Copyright &copy; 2015 <a href="https://www.capetown.gov.za/">City of Cape Town</a>'
+  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
-
-# imagery_layer "za_coct_aerial_2013" do
-#   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
-# end