imagery: workaround account issue in tests

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

diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb
index a060c17bcdb06b921c0a6de74ed5b0f3ee77387e..9cf0692f2a6244acd9f6c86bd9bc4adb7b846395 100644 (file)
--- a/cookbooks/imagery/recipes/default.rb
+++ b/cookbooks/imagery/recipes/default.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: imagery
+# Cookbook:: imagery

 # Recipe:: default
 #
 # 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
 #
 #
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,20 +17,68 @@
 # 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
-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 %w[
+  spawn-fcgi
+  multiwatch
+]

 
 # Imagery processing Requirements
 package "imagemagick"
 
 # Imagery misc compression
 
 # Imagery processing Requirements
 package "imagemagick"
 
 # Imagery misc compression

-package "xz-utils"
+package %w[
+  xz-utils
+  unzip
+]
+
+directory "/srv/imagery/mapserver" do
+  owner "root"
+  group "root"
+  mode "755"
+  recursive true
+end
+
+directory "/srv/imagery/common" do
+  owner "root"
+  group "root"
+  mode "755"
+  recursive true
+end
+
+# 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