diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-02-19 19:14:12 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-02-19 19:14:12 -0200 |
| commit | 51865fd8bfacc87e1ab85d560eb4f182a5d9113c (patch) | |
| tree | f05f5ca584fd8bdbd18309d095c2bca3be81e050 /manifests | |
| parent | 1ce6003bf9710c1b75885a65b48fe8d638398e87 (diff) | |
| download | puppet-puppet-51865fd8bfacc87e1ab85d560eb4f182a5d9113c.tar.gz puppet-puppet-51865fd8bfacc87e1ab85d560eb4f182a5d9113c.tar.bz2 | |
Enhancing check-puppetd.sh
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/puppetd.pp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/manifests/puppetd.pp b/manifests/puppetd.pp index 66edf43..7f00241 100644 --- a/manifests/puppetd.pp +++ b/manifests/puppetd.pp @@ -32,9 +32,9 @@ class puppetd inherits puppet { # name of puppet agent section in config file if $puppetversion <= "0.25.4" { - $puppet_agent_section = 'puppetd' + $puppet_agent_name = 'puppetd' } else { - $puppet_agent_section = 'agent' + $puppet_agent_name = 'agent' } # default config file for puppet nodes @@ -59,11 +59,11 @@ class puppetd inherits puppet { } file { "/usr/local/sbin/check-puppetd.sh": - source => "puppet://$server/modules/puppet/check-puppetd.sh", - owner => "puppet", - group => "puppet", - mode => 0755, - ensure => present, + content => template("puppet/check-puppetd.sh.erb"), + owner => "puppet", + group => "puppet", + mode => 0755, + ensure => present, } cron { "puppetd-check": |