Exclude chef repo from default receive hooks

[chef.git] / cookbooks / git / recipes / server.rb

diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb
index f8f0ef3d4cac2b571e1d4a1b4ae1a469f8d01db4..c8077a3032b8356ebd0f2cac837324d041b7da67 100644 (file)
--- a/cookbooks/git/recipes/server.rb
+++ b/cookbooks/git/recipes/server.rb
@@ -25,7 +25,7 @@ git_directory = node[:git][:directory]
 directory git_directory do
   owner node[:git][:user]
   group node[:git][:group]
-  mode 02775
+  mode 0o2775
 end
 
 if node[:git][:allowed_nodes]
@@ -58,17 +58,17 @@ Dir.new(git_directory).select { |name| name =~ /\.git$/ }.each do |repository|
     source "post-update.erb"
     owner "root"
     group node[:git][:group]
-    mode 0755
+    mode 0o755
   end
 
-  if node[:recipes].include?("trace") and repository != "dns.git"
-    template "#{git_directory}/#{repository}/hooks/post-receive" do
-      source "post-receive.erb"
-      owner "root"
-      group node[:git][:group]
-      mode 0755
-      variables :repository => "#{git_directory}/#{repository}"
-    end
+  next unless node[:recipes].include?("trac") && repository != "dns.git" && repository != "chef.git"
+
+  template "#{git_directory}/#{repository}/hooks/post-receive" do
+    source "post-receive.erb"
+    owner "root"
+    group node[:git][:group]
+    mode 0o755
+    variables :repository => "#{git_directory}/#{repository}"
   end
 end
 
@@ -76,13 +76,13 @@ template "/etc/cron.daily/git-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
 end
 
 template "/etc/xinetd.d/git" do
   source "xinetd.erb"
   owner "root"
   group "root"
-  mode 0644
-  notifies :reload, resources(:service => "xinetd")
+  mode 0o644
+  notifies :reload, "service[xinetd]"
 end