Restrict fail2ban to evasive blocks instead of all 403 errors

[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 b9af18645ff1fd4a7ef8f8b977926d519e36cb21..4771e81a64f5fef168f34634746a15d39faaafc4 100644 (file)
--- a/cookbooks/imagery/recipes/gb_os_sv.rb
+++ b/cookbooks/imagery/recipes/gb_os_sv.rb
@@ -1056,19 +1056,6 @@ imagery_layer "gb_os_sv_diff_2015_11_2016_04" do
   overlay true
 end
 
-imagery_layer "gb_os_om_local_2020_04" do
-  site "os.openstreetmap.org"
-  title "OS OpenMap Local - April 2020"
-  projection "EPSG:27700"
-  source "/data/imagery/gb/openmap-local/2020-04/os-openmap-local-2020-04-combined-sea-average-zstd22.vrt"
-  copyright "Contains OS data © Crown copyright and database right 2020"
-  revision 2
-  background_colour "213 244 248" # OS OpenMap Local Water Blue
-  extension "os_om_local_png"
-  url_aliases ["/om-local-2020-04", "/om-local"]
-  default_layer true
-end
-
 imagery_layer "gb_os_om_local_2016_10" do
   site "os.openstreetmap.org"
   title "OS OpenMap Local - October 2016"
@@ -1128,3 +1115,86 @@ imagery_layer "gb_os_om_local_2019_04" do
   background_colour "213 244 248" # OS OpenMap Local Water Blue
   extension "os_om_local_png"
 end
+
+imagery_layer "gb_os_om_local_2020_04" do
+  site "os.openstreetmap.org"
+  title "OS OpenMap Local - April 2020"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/openmap-local/2020-04/os-openmap-local-2020-04-combined-sea-average-zstd22.vrt"
+  copyright "Contains OS data © Crown copyright and database right 2020"
+  revision 2
+  background_colour "213 244 248" # OS OpenMap Local Water Blue
+  extension "os_om_local_png"
+end
+
+imagery_layer "gb_os_om_local_2020_10" do
+  site "os.openstreetmap.org"
+  title "OS OpenMap Local - October 2020"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/openmap-local/2020-10/os-openmap-local-2020-10.vrt"
+  copyright "Contains OS data © Crown copyright and database right 2020"
+  background_colour "213 244 248" # OS OpenMap Local Water Blue
+  extension "os_om_local_png"
+end
+
+imagery_layer "gb_os_om_local_2021_04" do
+  site "os.openstreetmap.org"
+  title "OS OpenMap Local - April 2021"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/openmap-local/2021-04/os-openmap-local-2021-04.vrt"
+  copyright "Contains OS data © Crown copyright and database right 2021"
+  background_colour "213 244 248" # OS OpenMap Local Water Blue
+  extension "os_om_local_png"
+end
+
+imagery_layer "gb_os_om_local_2021_10" do
+  site "os.openstreetmap.org"
+  title "OS OpenMap Local - October 2021"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/openmap-local/2021-10/os-openmap-local-2021-10.vrt"
+  copyright "Contains OS data © Crown copyright and database right 2021"
+  background_colour "213 244 248" # OS OpenMap Local Water Blue
+  extension "os_om_local_png"
+end
+
+imagery_layer "gb_os_om_local_2022_04" do
+  site "os.openstreetmap.org"
+  title "OS OpenMap Local - April 2022"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/openmap-local/2022-04/os-openmap-local-2022-04.vrt"
+  copyright "Contains OS data © Crown copyright and database right 2022"
+  background_colour "213 244 248" # OS OpenMap Local Water Blue
+  extension "os_om_local_png"
+end
+
+imagery_layer "gb_os_om_local_2022_10" do
+  site "os.openstreetmap.org"
+  title "OS OpenMap Local - October 2022"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/openmap-local/2022-10/os-openmap-local-2022-10.vrt"
+  copyright "Contains OS data © Crown copyright and database right 2022"
+  background_colour "213 244 248" # OS OpenMap Local Water Blue
+  extension "os_om_local_png"
+end
+
+imagery_layer "gb_os_om_local_2023_04" do
+  site "os.openstreetmap.org"
+  title "OS OpenMap Local - April 2023"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/openmap-local/2023-04/os-openmap-local-2023-04.vrt"
+  copyright "Contains OS data © Crown copyright and database right 2023"
+  background_colour "213 244 248" # OS OpenMap Local Water Blue
+  extension "os_om_local_png"
+end
+
+imagery_layer "gb_os_om_local_2023_10" do
+  site "os.openstreetmap.org"
+  title "OS OpenMap Local - October 2023"
+  projection "EPSG:27700"
+  source "/data/imagery/gb/openmap-local/2023-10/os-openmap-local-2023-10.vrt"
+  copyright "Contains OS data © Crown copyright and database right 2023"
+  background_colour "213 244 248" # OS OpenMap Local Water Blue
+  extension "os_om_local_png"
+  url_aliases ["/om-local-2023-10", "/om-local"]
+  default_layer true
+end