diff options
author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2010-05-11 17:00:20 -0400 |
---|---|---|
committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2010-05-11 17:00:20 -0400 |
commit | 57d8ecf86f49db2c9e367480e380a73cad4b71e6 (patch) | |
tree | 473263b26fdb525e7e7c90efbf919b9d3f02dd99 /manifests/base.pp | |
parent | 0f0434a582c1f3bd274a79e51ab34a2f4887e659 (diff) | |
parent | fc72cbc8a9d09b2d305df061dfc74cc960610d85 (diff) |
Merge commit 'nadir/master'
Diffstat (limited to 'manifests/base.pp')
-rw-r--r-- | manifests/base.pp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 081df5e..ebf4d7a 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -11,7 +11,9 @@ class puppet::base { "puppet://$server/modules/puppet/client/puppet.conf.$operatingsystem", "puppet://$server/modules/puppet/client/puppet.conf" ], notify => Service[puppet], - owner => root, group => 0, mode => 600; + # if puppetmasterd is deployed by apache2/passenger it needs to read puppet.conf + # therefore it must be readable by puppet + owner => puppet, group => 0, mode => 600; } service{'puppet': ensure => running, |