X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1f3ddddc98fcc15fb18a2d11ff2787c3b9c0e376..b755d11d4c83d4ccc49845e4d8b2b5c7181b27f4:/cookbooks/imagery/recipes/default.rb?ds=sidebyside

diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb
index 7a5b55057..7c1a1f88c 100644
--- a/cookbooks/imagery/recipes/default.rb
+++ b/cookbooks/imagery/recipes/default.rb
@@ -17,21 +17,25 @@
 # limitations under the License.
 #
 
+include_recipe "accounts"
 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
@@ -46,46 +50,49 @@ package %w[
   unzip
 ]
 
-directory "/srv/imagery/mapserver" do
+template "/etc/mapserver.conf" do
+  source "mapserver.conf.erb"
   owner "root"
   group "root"
-  mode "755"
-  recursive true
+  mode "644"
 end
 
-directory "/srv/imagery/common" do
+directory "/srv/imagery/mapserver" do
   owner "root"
   group "root"
   mode "755"
   recursive true
 end
 
-directory "/srv/imagery/common/ostn02-ntv2-data" do
+directory "/srv/imagery/common" do
   owner "root"
   group "root"
   mode "755"
+  recursive true
 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"
-  not_if { ::File.exist?("/srv/imagery/common/ostn02-ntv2-data/OSTN02_NTv2.gsb") }
-end
-
-archive_file "#{Chef::Config[:file_cache_path]}/ostn02-ntv2-data.zip" do
-  destination "/srv/imagery/common/ostn02-ntv2-data"
+directory "/srv/imagery/sockets" do
   owner "root"
   group "root"
-  not_if { ::File.exist?("/srv/imagery/common/ostn02-ntv2-data/OSTN02_NTv2.gsb") }
+  mode "777"
+  recursive true
 end
 
-nginx_site "default" do
-  template "nginx_default.conf.erb"
-  directory "/srv/imagery/default"
+# Pre-download uk_os_OSTN15_NTv2_OSGBtoETRS.tif used for EPSG:27700 conversions
+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
 
+# nginx_site "default" do
+#   template "nginx_default.conf.erb"
+#   directory "/srv/imagery/default"
+# end
+
 systemd_tmpfile "/run/mapserver-fastcgi" do
   type "d"
   owner "imagery"
   group "imagery"
   mode "0755"
+  not_if { kitchen? }
 end