From 735572fac73a710321b2bc469be2cbdf17c46b11 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Sun, 28 Nov 2010 13:01:46 -0500 Subject: Fix whitespace and coding standards to use standard formatting styles (I believe that this Closes #2353) --- manifests/cron/base.pp | 4 ++-- manifests/cron/linux.pp | 1 + manifests/cron/openbsd.pp | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'manifests/cron') diff --git a/manifests/cron/base.pp b/manifests/cron/base.pp index acef55e..7daa6fb 100644 --- a/manifests/cron/base.pp +++ b/manifests/cron/base.pp @@ -1,6 +1,6 @@ # manifests/cron/base.pp - class puppet::cron::base inherits puppet::base { + Service['puppet']{ enable => false, } @@ -21,7 +21,7 @@ class puppet::cron::base inherits puppet::base { pattern => 'puppetd', } # this works only on < 2.6 - exec{'stop_puppet': + 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 a5008bf..b3a10aa 100644 --- a/manifests/cron/linux.pp +++ b/manifests/cron/linux.pp @@ -1,5 +1,6 @@ # manifests/cron/linux.pp class puppet::cron::linux inherits puppet::linux { + include puppet::cron::base if !$puppet_config { $puppet_config = '/etc/puppet/puppet.conf' } if $puppet_http_compression { $puppet_http_compression_str = '--http_compression' } diff --git a/manifests/cron/openbsd.pp b/manifests/cron/openbsd.pp index 4ee293f..084b022 100644 --- a/manifests/cron/openbsd.pp +++ b/manifests/cron/openbsd.pp @@ -1,4 +1,5 @@ class puppet::cron::openbsd inherits puppet::openbsd { + include puppet::cron::base if !$puppet_config { $puppet_config = '/etc/puppet/puppet.conf' } if $puppet_http_compression { $puppet_http_compression_str = '--http_compression' } -- cgit v1.2.3