summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/cron.pp1
-rw-r--r--manifests/cron/debian.pp7
-rw-r--r--manifests/cron/linux.pp4
-rw-r--r--manifests/linux.pp11
-rw-r--r--manifests/master/checklastrun.pp16
-rw-r--r--manifests/master/checklastrun/disable.pp3
6 files changed, 21 insertions, 21 deletions
diff --git a/manifests/cron.pp b/manifests/cron.pp
index 2e54a66..9a8e777 100644
--- a/manifests/cron.pp
+++ b/manifests/cron.pp
@@ -24,7 +24,6 @@ class puppet::cron(
shorewall_puppetmaster_signport => $shorewall_puppetmaster_signport,
}
case $::operatingsystem {
- debian: { include puppet::cron::debian }
openbsd: { include puppet::cron::openbsd }
default: {
case $::kernel {
diff --git a/manifests/cron/debian.pp b/manifests/cron/debian.pp
deleted file mode 100644
index 0b4bd61..0000000
--- a/manifests/cron/debian.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-class puppet::cron::debian inherits puppet::cron::linux {
-
- File['/etc/cron.d/puppetd.cron']{
- path => '/etc/cron.d/puppetd',
- }
-
-}
diff --git a/manifests/cron/linux.pp b/manifests/cron/linux.pp
index 9b69dc1..3742d48 100644
--- a/manifests/cron/linux.pp
+++ b/manifests/cron/linux.pp
@@ -3,9 +3,9 @@ class puppet::cron::linux inherits puppet::linux {
include puppet::cron::base
- File['/etc/cron.d/puppetd.cron']{
+ File['/etc/cron.d/puppetd']{
source => undef,
- content => "#run puppet\n$puppet::cron::base::crontime root output=\$(/usr/bin/puppet agent --onetime --no-daemonize --splay --config=/etc/puppet/puppet.conf --color false ${puppet::cron::base::http_compression_str}); ret=\$?; printf \"\\%s\" \"\$output\" | grep -E '(^err:|^alert:|^emerg:|^crit:)'; exit \$ret\n",
+ content => "#run puppet\n${puppet::cron::base::crontime} root output=\$(/usr/bin/puppet agent --onetime --no-daemonize --splay --config=/etc/puppet/puppet.conf --color false ${puppet::cron::base::http_compression_str}); ret=\$?; printf \"\\%s\" \"\$output\" | grep -E '(^err:|^alert:|^emerg:|^crit:)'; exit \$ret\n",
before => Service['puppet'],
}
}
diff --git a/manifests/linux.pp b/manifests/linux.pp
index 6fc17ba..7bf3331 100644
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -1,3 +1,4 @@
+# puppet on linux
class puppet::linux inherits puppet::base {
package { 'puppet':
@@ -12,10 +13,12 @@ class puppet::linux inherits puppet::base {
require => Package[puppet],
}
- file { '/etc/cron.d/puppetd.cron':
- source => [ "puppet:///modules/site_puppet/cron.d/puppetd",
+ file { '/etc/cron.d/puppetd':
+ source => ['puppet:///modules/site_puppet/cron.d/puppetd',
"puppet:///modules/puppet/cron.d/puppetd.${::operatingsystem}",
- "puppet:///modules/puppet/cron.d/puppetd" ],
- owner => root, group => 0, mode => 0644,
+ 'puppet:///modules/puppet/cron.d/puppetd' ],
+ owner => root,
+ group => 0,
+ mode => '0644',
}
}
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,
}
}