squid: disable forced syslog on 20.04

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

diff --git a/cookbooks/imagery/recipes/gb_ea.rb b/cookbooks/imagery/recipes/gb_ea.rb
index 6aaec2ce4774f10d752eab28e4928ac3cf339dc3..bdcb34f593c10ab49850fe89f20b51174c66cc31 100644 (file)
--- a/cookbooks/imagery/recipes/gb_ea.rb
+++ b/cookbooks/imagery/recipes/gb_ea.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: imagery
+# Cookbook:: imagery

 # Recipe:: gb_ea
 #
 # Recipe:: gb_ea
 #

-# 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
 #
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -19,7 +19,7 @@
 
 imagery_site "ea.openstreetmap.org.uk" do
   title "OpenStreetMap - Environment Agency OpenData"
 
 imagery_site "ea.openstreetmap.org.uk" do
   title "OpenStreetMap - Environment Agency OpenData"

-  bbox [[49.85, -10.5], [58.75, 1.9]]
+  bbox [[51.35, -2.2], [52.65, 0.10]]

 end
 
 imagery_layer "gb_ea_night" do
 end
 
 imagery_layer "gb_ea_night" do


@@ -27,9 +27,18 @@ imagery_layer "gb_ea_night" do
   title "Environment Agency - Night Time Aerial"
   default_layer true
   projection "EPSG:27700"
   title "Environment Agency - Night Time Aerial"
   default_layer true
   projection "EPSG:27700"

-  source "/data/imagery/gb/ea/night/ea-night.vrt"
-  max_zoom 19
+  source "/data/imagery/gb/ea/night/ea-night-test.vrt"
+  max_zoom 20
+  copyright "© Environment Agency copyright and/or database right 2016. All rights reserved."
+  background_colour "0 0 0"
+end
+
+imagery_layer "gb_ea_ortho_2015" do
+  site "ea.openstreetmap.org.uk"
+  title "Environment Agency - Ortho - 2015"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/ea/ortho/ea-ortho-2015-combined.vrt"
+  max_zoom 20

   copyright "© Environment Agency copyright and/or database right 2016. All rights reserved."
   background_colour "0 0 0"
   copyright "© Environment Agency copyright and/or database right 2016. All rights reserved."
   background_colour "0 0 0"

-  extension "os_sv_png"

 end
 end