summaryrefslogtreecommitdiff
path: root/manifests/master
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-24 17:02:24 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-24 17:02:24 -0200
commit3e02d3109f03ab24bc930887c82b94f3a720ef15 (patch)
treecb69924d00afc6012c76a3c6bd90697ee6ebb9ea /manifests/master
parent2656922c44319aae67092c3c02560944c1f837b8 (diff)
downloadpuppet-puppet-3e02d3109f03ab24bc930887c82b94f3a720ef15.tar.gz
puppet-puppet-3e02d3109f03ab24bc930887c82b94f3a720ef15.tar.bz2
Changing update suid scheme
Diffstat (limited to 'manifests/master')
-rw-r--r--manifests/master/update.pp14
1 files 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,