Update piwik to 3.1.0

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

diff --git a/cookbooks/imagery/recipes/default.rb b/cookbooks/imagery/recipes/default.rb
index e1248787525870f117759ca4cea2c6a2facbf1e9..5a8e5517dfcc62b8bae3bad71786cf7985bf8b4a 100644 (file)
--- a/cookbooks/imagery/recipes/default.rb
+++ b/cookbooks/imagery/recipes/default.rb
@@ -40,24 +40,24 @@ package "imagemagick"
 package "xz-utils"
 package "unzip"
 
 package "xz-utils"
 package "unzip"
 

-# Create Directory for mapserver-fastcgi imagery sockets
-directory "/var/run/mapserver-fastcgi" do
-  owner "imagery"
-  group "imagery"
-  mode 0755
+directory "/srv/imagery/mapserver" do
+  owner "root"
+  group "root"
+  mode 0o755
+  recursive true

 end
 
 directory "/srv/imagery/common" do
   owner "root"
   group "root"
 end
 
 directory "/srv/imagery/common" do
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

   recursive true
 end
 
 directory "/srv/imagery/common/ostn02-ntv2-data" do
   owner "root"
   group "root"
   recursive true
 end
 
 directory "/srv/imagery/common/ostn02-ntv2-data" do
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 remote_file "#{Chef::Config[:file_cache_path]}/ostn02-ntv2-data.zip" do
 end
 
 remote_file "#{Chef::Config[:file_cache_path]}/ostn02-ntv2-data.zip" do


@@ -72,3 +72,16 @@ execute "unzip-ostn02-ntv2-data" do
   group "root"
   not_if { File.exist?("/srv/imagery/common/ostn02-ntv2-data/OSTN02_NTv2.gsb") }
 end
   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
+
+systemd_tmpfile "/run/mapserver-fastcgi" do
+  type "d"
+  owner "imagery"
+  group "imagery"
+  mode "0755"
+end