diff options
| author | Micah Anderson <micah@riseup.net> | 2010-11-28 13:01:46 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2010-11-28 13:01:46 -0500 |
| commit | 735572fac73a710321b2bc469be2cbdf17c46b11 (patch) | |
| tree | 96b4c66216e132b7f1244456d074b4b69d01ba70 /manifests/cron | |
| parent | bec32391d6678a9f52f71658d98a2700ddd31f60 (diff) | |
Fix whitespace and coding standards to use standard formatting styles (I believe that this Closes #2353)
Diffstat (limited to 'manifests/cron')
| -rw-r--r-- | manifests/cron/base.pp | 4 | ||||
| -rw-r--r-- | manifests/cron/linux.pp | 1 | ||||
| -rw-r--r-- | manifests/cron/openbsd.pp | 1 |
3 files changed, 4 insertions, 2 deletions
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' } |