X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/18e12b0e123fc3e5f344682f884feabc12da0f5a..675a6a3003f8948e33117a637567d143db73e7e4:/cookbooks/imagery/recipes/default.rb diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb index 4e158c0db..7c1a1f88c 100644 --- a/cookbooks/imagery/recipes/default.rb +++ b/cookbooks/imagery/recipes/default.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: imagery +# Cookbook:: imagery # Recipe:: default # -# Copyright 2016, OpenStreetMap Foundation +# Copyright:: 2016, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,23 +17,25 @@ # limitations under the License. # +include_recipe "accounts" include_recipe "nginx" include_recipe "git" -# Imagery gdal Requirements +# Imagery gdal and proj requirements 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 ] -# Mapserver via Nginx requires as fastcgi spawner +# Mapserver via nginx requires as fastcgi spawner package %w[ spawn-fcgi multiwatch @@ -48,48 +50,49 @@ package %w[ unzip ] +template "/etc/mapserver.conf" do + source "mapserver.conf.erb" + owner "root" + group "root" + mode "644" +end + 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" - mode 0o755 + mode "755" recursive true end -directory "/srv/imagery/common/ostn02-ntv2-data" do +directory "/srv/imagery/sockets" do owner "root" group "root" - mode 0o755 -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") } + mode "777" + recursive true 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") } +# 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" - 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" + not_if { kitchen? } end