civicrm version bump

[chef.git] / cookbooks / web / recipes / base.rb

diff --git a/cookbooks/web/recipes/base.rb b/cookbooks/web/recipes/base.rb
index d82ea20f2f39c5a8f28f0407f47ebb6fde58a8b5..2c943c6246f8e949c27d1465cb4039188ee2276a 100644 (file)
--- a/cookbooks/web/recipes/base.rb
+++ b/cookbooks/web/recipes/base.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: web
+# Cookbook:: web
 # Recipe:: base
 #
-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,28 +22,30 @@ node.default[:nfs]["/store/rails"] = {
   :path => "/store/rails"
 }
 
+include_recipe "accounts"
 include_recipe "nfs"
 
 directory node[:web][:base_directory] do
   group "rails"
-  mode 0o2775
+  mode "2775"
 end
 
-directory node[:web][:pid_directory] do
+systemd_tmpfile node[:web][:pid_directory] do
+  type "d"
   owner "rails"
   group "rails"
-  mode 0o775
+  mode "0755"
 end
 
 directory node[:web][:log_directory] do
   owner "rails"
   group "rails"
-  mode 0o775
+  mode "775"
 end
 
 template "/etc/logrotate.d/web" do
   source "logrotate.web.erb"
   owner "root"
   group "root"
-  mode 0o644
+  mode "644"
 end