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

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

diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb
index a473b445299d764a80fe35e5184702e7bd9c97ed..7c1a1f88cff78fe9cc71df3ab959a507eb137b79 100644 (file)
--- a/cookbooks/imagery/recipes/default.rb
+++ b/cookbooks/imagery/recipes/default.rb
@@ -50,6 +50,13 @@ package %w[
   unzip
 ]
 
   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"
 directory "/srv/imagery/mapserver" do
   owner "root"
   group "root"


@@ -64,6 +71,13 @@ directory "/srv/imagery/common" do
   recursive true
 end
 
   recursive true
 end
 

+directory "/srv/imagery/sockets" do
+  owner "root"
+  group "root"
+  mode "777"
+  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"
 # 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"


@@ -80,4 +94,5 @@ systemd_tmpfile "/run/mapserver-fastcgi" do
   owner "imagery"
   group "imagery"
   mode "0755"
   owner "imagery"
   group "imagery"
   mode "0755"

+  not_if { kitchen? }

 end
 end