X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/e58a930181b9313423d6ede11f98e313bc9a0e41..2678c041db64440f0a15a1178d812140d3b90eb7:/cookbooks/chef/recipes/repository.rb diff --git a/cookbooks/chef/recipes/repository.rb b/cookbooks/chef/recipes/repository.rb index 44e9db114..752938bf3 100644 --- a/cookbooks/chef/recipes/repository.rb +++ b/cookbooks/chef/recipes/repository.rb @@ -17,6 +17,7 @@ # limitations under the License. # +include_recipe "chef::knife" include_recipe "git" keys = data_bag_item("chef", "keys") @@ -28,7 +29,7 @@ end directory "/var/lib/chef" do owner "chefrepo" group "chefrepo" - mode 0o2775 + mode "2775" end %w[public private].each do |repository| @@ -45,28 +46,28 @@ end directory "/var/lib/chef/#{repository}/.chef" do owner "chefrepo" group "chefrepo" - mode 0o2775 + mode "2775" end file "/var/lib/chef/#{repository}/.chef/client.pem" do content keys["git"].join("\n") owner "chefrepo" group "chefrepo" - mode 0o660 + mode "660" end cookbook_file "/var/lib/chef/#{repository}/.chef/knife.rb" do source "knife.rb" owner "chefrepo" group "chefrepo" - mode 0o660 + mode "660" end template "#{repository_directory}/hooks/post-receive" do source "post-receive.erb" owner "chefrepo" group "chefrepo" - mode 0o750 + mode "750" variables :repository => repository end end