Merge branch 'puppet_cron'

Conflicts:
	manifests/cron.pp
	manifests/linux.pp

take the changes from puppet_cron

1 files changed, 5 insertions, 5 deletions

diff --git a/manifests/linux.pp b/manifests/linux.pp
index d17b386..e752788 100644
--- a/manifests/linux.pp
+++ b/manifests/linux.pp
@@ -13,12 +13,12 @@ class puppet::linux inherits puppet::base {
   Service['puppet']{
     require => Package[puppet],
   }
-  
+
+  file { '/etc/cron.d/puppetd':
+    ensure => absent
+  }
+  # For backwards compatibility, remove this so that the cron is not duplicated
   file { '/etc/cron.d/puppetd.cron':
-    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,
     ensure => absent
   }
 }