Merge branch 'patch-2' of https://github.com/Tigerfell/chef into pr257

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

diff --git a/cookbooks/web/recipes/base.rb b/cookbooks/web/recipes/base.rb
index 2258b3f8417697b5baaef71bf22d280498278d4d..2c943c6246f8e949c27d1465cb4039188ee2276a 100644 (file)
--- a/cookbooks/web/recipes/base.rb
+++ b/cookbooks/web/recipes/base.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: web
+# Cookbook:: web

 # Recipe:: base
 #
 # 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.
 # 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,26 +17,35 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

+node.default[:nfs]["/store/rails"] = {
+  :host => node[:web][:fileserver],
+  :path => "/store/rails"
+}
+
+include_recipe "accounts"
+include_recipe "nfs"
+

 directory node[:web][:base_directory] do
   group "rails"
 directory node[:web][:base_directory] do
   group "rails"

-  mode 02775
+  mode "2775"

 end
 
 end
 

-directory node[:web][:pid_directory] do
+systemd_tmpfile node[:web][:pid_directory] do
+  type "d"

   owner "rails"
   group "rails"
   owner "rails"
   group "rails"

-  mode 0775
+  mode "0755"

 end
 
 directory node[:web][:log_directory] do
   owner "rails"
   group "rails"
 end
 
 directory node[:web][:log_directory] do
   owner "rails"
   group "rails"

-  mode 0775
+  mode "775"

 end
 
 template "/etc/logrotate.d/web" do
   source "logrotate.web.erb"
   owner "root"
   group "root"
 end
 
 template "/etc/logrotate.d/web" do
   source "logrotate.web.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode "644"

 end
 end