Merge remote-tracking branch 'tigerfell/pr257'

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

diff --git a/cookbooks/web/recipes/base.rb b/cookbooks/web/recipes/base.rb
index 374c970b42dd06c23ec002c52c2b973ef7319b06..6fe8c7f5d6b939441de070efc4649db9048d7e04 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
 #
-# 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
 #
-#     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,
@@ -17,33 +17,29 @@
 # limitations under the License.
 #
 
-node.set[:nfs]["/store/rails"] = {
-  :host => node[:web][:fileserver],
-  :path => "/store/rails"
-}
-
-include_recipe "nfs"
+include_recipe "accounts"
 
 directory node[:web][:base_directory] do
   group "rails"
-  mode 02775
+  mode "2775"
 end
 
-directory node[:web][:pid_directory] do
+systemd_tmpfile node[:web][:pid_directory] do
+  type "d"
   owner "rails"
   group "rails"
-  mode 0775
+  mode "0755"
 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"
-  mode 0644
+  mode "644"
 end