diff options
| author | Michael Scherer <misc@mageia.org> | 2010-12-14 11:30:03 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-12-14 11:30:03 +0000 |
| commit | 850c7fb4e9d6295d1457fc128f510b30399d9eef (patch) | |
| tree | f2618e0c2c2de15c3a093b0c59f29c1b7519eebf /modules | |
| parent | febf61d3d22dd6f29d8dc38e1f2d6f93dd2b8b95 (diff) | |
| download | puppet-850c7fb4e9d6295d1457fc128f510b30399d9eef.tar puppet-850c7fb4e9d6295d1457fc128f510b30399d9eef.tar.gz puppet-850c7fb4e9d6295d1457fc128f510b30399d9eef.tar.bz2 puppet-850c7fb4e9d6295d1457fc128f510b30399d9eef.tar.xz puppet-850c7fb4e9d6295d1457fc128f510b30399d9eef.zip | |
- do not restart when puppet.conf is updated, or this stop puppet while updating itself
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/puppet/manifests/init.pp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/modules/puppet/manifests/init.pp b/modules/puppet/manifests/init.pp index b3e3b598..641f5588 100644 --- a/modules/puppet/manifests/init.pp +++ b/modules/puppet/manifests/init.pp @@ -7,10 +7,17 @@ class puppet { service { puppet: ensure => running, - subscribe => [ Package[puppet], File["/etc/puppet/puppet.conf"]] + hasstatus => true, + subscribe => [ Package[puppet]] } - file { "/etc/puppet/puppet.conf": + exec { "service puppet reload": + refreshonly => true, + subscribe => [ File["puppet.conf"] ], + } + + file { "puppet.conf": + path => "/etc/puppet/puppet.conf", ensure => present, owner => root, group => root, @@ -33,7 +40,7 @@ class puppet { service { puppetmaster: ensure => running, path => "/etc/init.d/puppetmaster", - subscribe => [ Package[puppet-server], File["/etc/puppet/puppet.conf"]] + subscribe => [ Package[puppet-server], File["puppet.conf"]] } file { "extdata": |