Disable RC4, MD5 and SHA1 for SMTP encryption

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

diff --git a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb b/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
index 8f304c88b2b88976862f515a252eaa1fdc449c9d..a14c4fcfb6ace1a1eca6b00316622a3b07221e58 100644 (file)
--- a/cookbooks/imagery/recipes/gb_hampshire_aerial.rb
+++ b/cookbooks/imagery/recipes/gb_hampshire_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
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -30,6 +30,7 @@ imagery_layer "gb_hampshire_aerial_rgb" do
   default_layer true
   title "Hampshire Aerial - Summer 2013"
   source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-RGB.tif"
   default_layer true
   title "Hampshire Aerial - Summer 2013"
   source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-RGB.tif"

+  max_zoom 20

   projection "EPSG:27700"
   copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
   url_aliases ["/hampshire-rgb"]
   projection "EPSG:27700"
   copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
   url_aliases ["/hampshire-rgb"]


@@ -39,6 +40,7 @@ imagery_layer "gb_hampshire_aerial_fcir" do
   site "hampshire.aerial.openstreetmap.org.uk"
   title "Hampshire Aerial - Summer 2013 (False Colour IR)"
   source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-FCIR.tif"
   site "hampshire.aerial.openstreetmap.org.uk"
   title "Hampshire Aerial - Summer 2013 (False Colour IR)"
   source "/data/imagery/gb/hampshire-aerial/hampshire-aerial-FCIR.tif"

+  max_zoom 20

   projection "EPSG:27700"
   copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
   url_aliases ["/hampshire-fcir"]
   projection "EPSG:27700"
   copyright "Hampshire Hub - Open Government Licence (OGL) 2014"
   url_aliases ["/hampshire-fcir"]