From 3e02d3109f03ab24bc930887c82b94f3a720ef15 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Thu, 24 Jan 2013 17:02:24 -0200 Subject: Changing update suid scheme --- manifests/master/update.pp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/manifests/master/update.pp b/manifests/master/update.pp index fc30166..36c9828 100644 --- 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, -- cgit v1.2.3