imagery: Add proj + sync OSTN15_NTv2_OSGBtoETRS

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

diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb
index 961216f9d8b1a5e27404560003578e1d8991e4af..f8f811988a0f81f8758bcb815469a094ea1c0b2b 100644 (file)
--- a/cookbooks/imagery/recipes/default.rb
+++ b/cookbooks/imagery/recipes/default.rb
@@ -20,18 +20,21 @@
 include_recipe "nginx"
 include_recipe "git"
 
 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
 ]
 
 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
 package %w[
   spawn-fcgi
   multiwatch


@@ -49,32 +52,36 @@ package %w[
 directory "/srv/imagery/mapserver" do
   owner "root"
   group "root"
 directory "/srv/imagery/mapserver" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

   recursive true
 end
 
 directory "/srv/imagery/common" do
   owner "root"
   group "root"
   recursive true
 end
 
 directory "/srv/imagery/common" do
   owner "root"
   group "root"

-  mode 0o755
+  mode "755"

   recursive true
 end
 
 directory "/srv/imagery/common/ostn02-ntv2-data" do
   owner "root"
   group "root"
   recursive true
 end
 
 directory "/srv/imagery/common/ostn02-ntv2-data" do
   owner "root"
   group "root"

-  mode 0o755
+  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
 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
 
   not_if { ::File.exist?("/srv/imagery/common/ostn02-ntv2-data/OSTN02_NTv2.gsb") }
 end
 

-execute "unzip-ostn02-ntv2-data" do
-  command "unzip -q #{Chef::Config[:file_cache_path]}/ostn02-ntv2-data.zip"
-  cwd "/srv/imagery/common/ostn02-ntv2-data"
-  user "root"
+archive_file "#{Chef::Config[:file_cache_path]}/ostn02-ntv2-data.zip" do
+  destination "/srv/imagery/common/ostn02-ntv2-data"
+  owner "root"

   group "root"
   not_if { ::File.exist?("/srv/imagery/common/ostn02-ntv2-data/OSTN02_NTv2.gsb") }
 end
   group "root"
   not_if { ::File.exist?("/srv/imagery/common/ostn02-ntv2-data/OSTN02_NTv2.gsb") }
 end


@@ -82,7 +89,6 @@ end
 nginx_site "default" do
   template "nginx_default.conf.erb"
   directory "/srv/imagery/default"
 nginx_site "default" do
   template "nginx_default.conf.erb"
   directory "/srv/imagery/default"

-  reload_nginx false

 end
 
 systemd_tmpfile "/run/mapserver-fastcgi" do
 end
 
 systemd_tmpfile "/run/mapserver-fastcgi" do