Merge remote-tracking branch 'github/pull/713'

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

diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb
index 13a7f915b8e62d08c2fba5e7f0544beec879af5d..3c04dd8a36934b9d70b38b3e91df3bfbe4ede8a0 100644 (file)
--- a/cookbooks/imagery/recipes/default.rb
+++ b/cookbooks/imagery/recipes/default.rb
@@ -17,23 +17,25 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+include_recipe "accounts"

 include_recipe "nginx"
 include_recipe "git"
 
 include_recipe "nginx"
 include_recipe "git"
 

-# Imagery gdal Requirements
+# Imagery gdal and proj requirements

 package %w[
   gdal-bin
 package %w[
   gdal-bin

-  python-gdal
+  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


@@ -51,45 +53,39 @@ 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
 
   recursive true
 end
 

-directory "/srv/imagery/common/ostn02-ntv2-data" do
+directory "/srv/imagery/sockets" do

   owner "root"
   group "root"
   owner "root"
   group "root"

-  mode 0o755
+  mode "777"
+  recursive true

 end
 
 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") }
+# 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
 
 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"
-  group "root"
-  not_if { File.exist?("/srv/imagery/common/ostn02-ntv2-data/OSTN02_NTv2.gsb") }
-end
-
-nginx_site "default" do
-  template "nginx_default.conf.erb"
-  directory "/srv/imagery/default"
-  restart_nginx false
-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"
 
 systemd_tmpfile "/run/mapserver-fastcgi" do
   type "d"
   owner "imagery"
   group "imagery"
   mode "0755"

+  not_if { kitchen? }

 end
 end