From 0071c3a6bd357405bc790c468dc2683312fdfe75 Mon Sep 17 00:00:00 2001 From: Grant Slater Date: Mon, 31 Oct 2022 19:24:39 +0000 Subject: [PATCH] imagery: Add proj + sync OSTN15_NTv2_OSGBtoETRS --- cookbooks/imagery/recipes/default.rb | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb index 7a5b55057..f8f811988 100644 --- a/cookbooks/imagery/recipes/default.rb +++ b/cookbooks/imagery/recipes/default.rb @@ -20,18 +20,21 @@ include_recipe "nginx" include_recipe "git" -# Imagery gdal Requirements -package "gdal-bin" -# python-gdal - disable while broken in gis unstable repo +# Imagery gdal and proj requirements +package %w[ + gdal-bin + python3-gdal + proj-bin +] -# Imagery MapServer + Mapcache Requirements +# Imagery MapServer + Mapcache requirements package %w[ cgi-mapserver mapcache-cgi mapcache-tools ] -# Mapserver via Nginx requires as fastcgi spawner +# Mapserver via nginx requires as fastcgi spawner package %w[ spawn-fcgi multiwatch @@ -66,8 +69,13 @@ directory "/srv/imagery/common/ostn02-ntv2-data" do mode "755" end +execute "uk_os_OSTN15_NTv2_OSGBtoETRS.tif" do + command "projsync --file uk_os_OSTN15_NTv2_OSGBtoETRS.tif --system-directory" + not_if { ::File.exist?("/usr/share/proj/uk_os_OSTN15_NTv2_OSGBtoETRS.tif") } +end + remote_file "#{Chef::Config[:file_cache_path]}/ostn02-ntv2-data.zip" do - source "https://www.ordnancesurvey.co.uk/docs/gps/ostn02-ntv2-data.zip" + source "https://www.ordnancesurvey.co.uk/documents/resources/ostn02-ntv2-data.zip" not_if { ::File.exist?("/srv/imagery/common/ostn02-ntv2-data/OSTN02_NTv2.gsb") } end -- 2.39.5