Add support for configuring rails using settings.local.yml

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

diff --git a/cookbooks/web/recipes/base.rb b/cookbooks/web/recipes/base.rb
index d5b30ba66e856985e8e741a0c684dca24829e96a..f2f7c16a95e0f5ee28f472149b030300269355aa 100644 (file)
--- a/cookbooks/web/recipes/base.rb
+++ b/cookbooks/web/recipes/base.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # 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,7 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-node.set[:nfs]["/store/rails"] = {
+node.default[:nfs]["/store/rails"] = {

   :host => node[:web][:fileserver],
   :path => "/store/rails"
 }
   :host => node[:web][:fileserver],
   :path => "/store/rails"
 }


@@ -29,10 +29,11 @@ directory node[:web][:base_directory] do
   mode 0o2775
 end
 
   mode 0o2775
 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 0o775
+  mode "0755"

 end
 
 directory node[:web][:log_directory] do
 end
 
 directory node[:web][:log_directory] do