X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/e09a952838cef25511249a39ad8fbd203c29b9a2..7f6a64a65a5c512ba2ee9802bab4d99fd33d3e55:/cookbooks/web/recipes/base.rb diff --git a/cookbooks/web/recipes/base.rb b/cookbooks/web/recipes/base.rb index 374c970b4..f2f7c16a9 100644 --- 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 # -# 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,7 +17,7 @@ # limitations under the License. # -node.set[:nfs]["/store/rails"] = { +node.default[:nfs]["/store/rails"] = { :host => node[:web][:fileserver], :path => "/store/rails" } @@ -26,24 +26,25 @@ include_recipe "nfs" directory node[:web][:base_directory] do group "rails" - mode 02775 + mode 0o2775 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 0o775 end template "/etc/logrotate.d/web" do source "logrotate.web.erb" owner "root" group "root" - mode 0644 + mode 0o644 end