X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9eda23f8bac4f032b34df5edaf4c49b2be66870a..f65e6e5bdfdab789a385847963b9c1ffa799a6e3:/cookbooks/web/recipes/base.rb?ds=sidebyside diff --git a/cookbooks/web/recipes/base.rb b/cookbooks/web/recipes/base.rb index d5b30ba66..2c943c624 100644 --- 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,35 @@ # limitations under the License. # -node.set[:nfs]["/store/rails"] = { +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" - 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