From bfe861221f706cc488c8a247b6d494d07d79f465 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Wed, 15 Sep 2010 22:41:31 +0200
Subject: fix some issues with cron enabling/service disabling

---
 manifests/base.pp       |  1 -
 manifests/cron/base.pp  | 13 +++++++------
 manifests/cron/linux.pp |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'manifests')

diff --git a/manifests/base.pp b/manifests/base.pp
index 0c5b2b7..0a6e2f9 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -22,6 +22,5 @@ class puppet::base {
     enable => true,
     hasstatus => true,
     hasrestart => true,
-    pattern => puppetd,
   }
 }
diff --git a/manifests/cron/base.pp b/manifests/cron/base.pp
index b30b5b3..acef55e 100644
--- a/manifests/cron/base.pp
+++ b/manifests/cron/base.pp
@@ -18,14 +18,15 @@ class puppet::cron::base inherits puppet::base {
       } else {
         Service['puppet']{
           hasstatus => false,
+          pattern => 'puppetd',
+        }
+        # this works only on < 2.6
+        exec{'stop_puppet':
+          command => 'kill `cat /var/run/puppet/puppetd.pid`',
+          onlyif => 'test -f /var/run/puppet/puppetd.pid',
+          require => Service['puppet'],
         }
       }
     }
   }
-  # this works only on < 2.6
-  exec{'stop_puppet':
-    command => 'kill `cat /var/run/puppet/puppetd.pid`',
-    onlyif => 'test -f /var/run/puppet/puppetd.pid',
-    require => Service['puppet'],
-  }
 }
diff --git a/manifests/cron/linux.pp b/manifests/cron/linux.pp
index 6e8baf5..a5008bf 100644
--- a/manifests/cron/linux.pp
+++ b/manifests/cron/linux.pp
@@ -14,5 +14,6 @@ class puppet::cron::linux inherits puppet::linux {
   File['/etc/cron.d/puppetd.cron']{
     source => undef,
     content => "# run puppet\n$puppet_crontime root /usr/sbin/puppetd --onetime --no-daemonize --config=$puppet_config --color false $puppet_http_compression_str | grep -E '(^err:|^alert:|^emerg:|^crit:)'\n",
+    before => Service['puppet'],
   }
 }
-- 
cgit v1.2.3