Merge branch 'master' of git://git.puppet.immerda.ch/module-puppet

Conflicts:
	files/master/config.ru
	files/master/puppet.conf
	manifests/base.pp
	manifests/centos.pp
	manifests/cron.pp
	manifests/cron/base.pp
	manifests/cron/linux.pp
	manifests/debian.pp
	manifests/init.pp
	manifests/linux.pp
	manifests/master/linux.pp
	manifests/master/package/debian.pp
	manifests/puppetmaster/base.pp
	manifests/puppetmaster/centos.pp
	manifests/puppetmaster/checklastrun.pp
	manifests/puppetmaster/checklastrun/disable.pp
	manifests/puppetmaster/cleanup_reports.pp
	manifests/puppetmaster/cleanup_reports/disable.pp
	manifests/puppetmaster/debian.pp
	manifests/puppetmaster/package.pp
	manifests/puppetmaster/package/base.pp
	manifests/puppetmaster/passenger.pp

1 files changed, 0 insertions, 36 deletions

diff --git a/manifests/puppetmaster/checklastrun.pp b/manifests/puppetmaster/checklastrun.pp
deleted file mode 100644
index e4278c7..0000000
--- a/manifests/puppetmaster/checklastrun.pp
+++ /dev/null
@@ -1,36 +0,0 @@
-class puppet::puppetmaster::checklastrun {
-
-  $puppet_lastruncheck_ignorehosts_str = $::puppet_lastruncheck_ignorehosts ? {
-    ''      => '',
-    undef   => '',
-    default => "--ignore-hosts ${::puppet_lastruncheck_ignorehosts}"
-  }
-
-  $puppet_lastruncheck_timeout_str = $::puppet_lastruncheck_timeout ? {
-    ''      => '',
-    undef   => '',
-    default => "--timeout ${::puppet_lastruncheck_timeout}"
-  }
-
-  include ::cron
-
-  file{
-    '/usr/local/sbin/puppetlast':
-      source => [ 'puppet:///modules/puppet/master/lastruncheck' ],
-      owner  => root,
-      group  => 0,
-      mode   => '0700';
-
-    '/etc/cron.d/puppetlast':
-      content => "${puppetmaster_lastruncheck_cron} root output=\$(/usr/local/sbin/puppetlast ${puppet_lastruncheck_timeout_str} ${puppet_lastruncheck_ignorehosts_str} ${$puppet_lastruncheck_additionaloptions} 2>&1) || echo \"\$output\"\n",
-      require => File['/usr/local/sbin/puppetlast'],
-      owner   => root,
-      group   => 0,
-      mode    => '0644',
-      notify  => Service['cron'];
-
-    # Cleanup cronjob previously installed under a buggy name.
-    '/etc/cron.d/puppetlast.cron':
-      ensure => absent;
-  }
-}