diff options
| author | mh <mh@immerda.ch> | 2014-08-30 13:24:04 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2014-08-30 13:24:55 +0200 |
| commit | b8bd7e5c9208feb09019a395374a04437a8122a4 (patch) | |
| tree | 404a93abfbbf674b8f8e04eda605a2b0b63e2035 /manifests/master | |
| parent | c80c781fa05f94ac1c8631e068af98a6839b0a4a (diff) | |
fix cron name globally + linting
Diffstat (limited to 'manifests/master')
| -rw-r--r-- | manifests/master/checklastrun.pp | 16 | ||||
| -rw-r--r-- | manifests/master/checklastrun/disable.pp | 3 |
2 files changed, 12 insertions, 7 deletions
diff --git a/manifests/master/checklastrun.pp b/manifests/master/checklastrun.pp index 5375cc0..2544acc 100644 --- a/manifests/master/checklastrun.pp +++ b/manifests/master/checklastrun.pp @@ -1,3 +1,4 @@ +# check for last run class puppet::master::checklastrun { $puppet_lastruncheck_ignorehosts_str = $puppet::master::lastruncheck_ignorehosts ? { @@ -14,12 +15,15 @@ class puppet::master::checklastrun { file{ '/usr/local/sbin/puppetlast': - source => [ "puppet:///modules/puppet/master/lastruncheck" ], - owner => root, group => 0, mode => 0700; - - '/etc/cron.d/puppetlast.cron': + source => 'puppet:///modules/puppet/master/lastruncheck', + owner => root, + group => 0, + mode => '0700'; + '/etc/cron.d/puppetlast': content => "${puppet::master::lastruncheck_cron} root /usr/local/sbin/puppetlast ${puppet_lastruncheck_timeout_str} ${puppet_lastruncheck_ignorehosts_str} ${puppet::master::lastruncheck_additionaloptions} | grep -Ev '^OK: '\n", - require => File["/usr/local/sbin/puppetlast"], - owner => root, group => 0, mode => 0644, + require => File['/usr/local/sbin/puppetlast'], + owner => root, + group => 0, + mode => '0644'; } } diff --git a/manifests/master/checklastrun/disable.pp b/manifests/master/checklastrun/disable.pp index 655253d..e5a7198 100644 --- a/manifests/master/checklastrun/disable.pp +++ b/manifests/master/checklastrun/disable.pp @@ -1,3 +1,4 @@ +# disable the check class puppet::master::checklastrun::disable inherits puppet::master::checklastrun { File['/usr/local/sbin/puppetlast']{ @@ -5,7 +6,7 @@ class puppet::master::checklastrun::disable inherits puppet::master::checklastru ensure => absent, } - File['/etc/cron.d/puppetlast.cron']{ + File['/etc/cron.d/puppetlast']{ ensure => absent, } } |