X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4479ee5c32b8d5c7dc6cef37b4bbaed9402ed4fb..49e729f51ae97eb06c651ca23d86582b5f02e27f:/cookbooks/git/recipes/server.rb?ds=sidebyside diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb index 81b16952f..9b4e06a45 100644 --- a/cookbooks/git/recipes/server.rb +++ b/cookbooks/git/recipes/server.rb @@ -1,8 +1,8 @@ # -# Cookbook Name:: git +# Cookbook:: git # Recipe:: server # -# 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. @@ -17,6 +17,10 @@ # limitations under the License. # +node.default[:accounts][:users][:git][:status] = :role + +include_recipe "accounts" +include_recipe "apt" include_recipe "networking" git_directory = node[:git][:directory] @@ -24,19 +28,19 @@ git_directory = node[:git][:directory] directory git_directory do owner "root" group "root" - mode 0o775 + mode "775" end directory "#{git_directory}/public" do owner node[:git][:public_user] group node[:git][:public_group] - mode 0o2775 + mode "2775" end directory "#{git_directory}/private" do owner node[:git][:private_user] group node[:git][:private_group] - mode 0o2775 + mode "2775" end Dir.glob("#{git_directory}/*/*.git").each do |repository| @@ -44,7 +48,7 @@ Dir.glob("#{git_directory}/*/*.git").each do |repository| source "post-update.erb" owner "root" group node[:git][:group] - mode 0o755 + mode "755" end end @@ -52,5 +56,5 @@ template "/etc/cron.daily/git-backup" do source "backup.cron.erb" owner "root" group "root" - mode 0o755 + mode "755" end