diff options
| author | Micah Anderson <micah@riseup.net> | 2010-11-28 13:05:59 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2010-11-28 13:05:59 -0500 |
| commit | bb8ede5cfa0bdbdcc0244a590e6453f16d815cb6 (patch) | |
| tree | de040d9e7cbf5373890411c94c147ffcfeb43382 | |
| parent | a01d979d414e8ee41829a1cea0c78b830cf07085 (diff) | |
debian's puppet initscript has status functionality
Conflicts:
manifests/cron/base.pp
manifests/debian.pp
| -rw-r--r-- | manifests/cron/base.pp | 2 | ||||
| -rw-r--r-- | manifests/debian.pp | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/manifests/cron/base.pp b/manifests/cron/base.pp index 7daa6fb..74e0225 100644 --- a/manifests/cron/base.pp +++ b/manifests/cron/base.pp @@ -6,7 +6,7 @@ class puppet::cron::base inherits puppet::base { } case $operatingsystem { - debian,openbsd,ubuntu: { + openbsd: { #it's already disabled } default: { diff --git a/manifests/debian.pp b/manifests/debian.pp index e046e27..9f33c64 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -7,11 +7,6 @@ class puppet::debian inherits puppet::linux { "puppet:///modules/puppet/client/debian/puppet" ], notify => Service[puppet], owner => root, group => 0, mode => 0644; - } - - # there is really no status cmd for it - Service[puppet]{ - hasstatus => false, } File['/etc/cron.d/puppetd.cron']{ |