Changing update suid scheme

diff --git a/manifests/master/update.pp b/manifests/master/update.pp
index fc301662073ba2b5d80e53c5b06c755fdbcf85a3..36c9828bd91dcc58f03715100b690fce040f184b 100644 (file)
--- a/manifests/master/update.pp
+++ b/manifests/master/update.pp
@@ -5,8 +5,14 @@ class puppet::master::update(
   file { "/usr/local/sbin/update-puppet-conf.sh":
     source => "puppet:///modules/puppet/update-puppet-conf.sh",
     owner  => "puppet",
-    group  => "puppet",
-    mode   => 0755,
+    group  => $method ? {
+      'cron'  => "puppet",
+      default => "gitolite",
+    },
+    mode   => $method ? {
+      'cron'  => 0755,
+      default => 4750,
+    },
     ensure => present,
   }
 
@@ -24,8 +30,8 @@ class puppet::master::update(
 
   # use a post-update hook
   file { '/var/git/repositories/puppet.git/hooks/post-update':
-    mode   => 4750,
-    owner  => puppet,
+    mode   => 0750,
+    owner  => gitolite,
     group  => gitolite,
     ensure => $method ? {
       'cron'  => absent,