X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/56df259055ae541d1f31b8502c549cb84f74778e..afcb07ba438a01c65d701902dfcb39b04a0719ec:/cookbooks/imagery/recipes/default.rb?ds=inline diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb index 7c3d186aa..7c1a1f88c 100644 --- a/cookbooks/imagery/recipes/default.rb +++ b/cookbooks/imagery/recipes/default.rb @@ -1,14 +1,14 @@ # -# 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. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -17,65 +17,82 @@ # limitations under the License. # +include_recipe "accounts" include_recipe "nginx" include_recipe "git" -# Imagery gdal Requirements -package "gdal-bin" -package "python-gdal" +# Imagery gdal and proj requirements +package %w[ + gdal-bin + python3-gdal + proj-bin +] -# Imagery MapServer + Mapcache Requirements -package "cgi-mapserver" -package "mapcache-cgi" -package "mapcache-tools" +# Imagery MapServer + Mapcache requirements +package %w[ + cgi-mapserver + mapcache-cgi + mapcache-tools +] -# Mapserver via Nginx requires as fastcgi spawner -package "spawn-fcgi" -package "multiwatch" +# Mapserver via nginx requires as fastcgi spawner +package %w[ + spawn-fcgi + multiwatch +] # Imagery processing Requirements package "imagemagick" # Imagery misc compression -package "xz-utils" -package "unzip" +package %w[ + xz-utils + unzip +] -# Create Directory for mapserver-fastcgi imagery sockets -directory "/var/run/mapserver-fastcgi" do - owner "imagery" - group "imagery" - mode 0755 +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 0755 + mode "755" recursive true end directory "/srv/imagery/common" do owner "root" group "root" - mode 0755 + mode "755" recursive true end -directory "/srv/imagery/common/ostn02-ntv2-data" do +directory "/srv/imagery/sockets" do owner "root" group "root" - mode 0755 + mode "777" + 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") } +# 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 -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") } +# 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