diff options
| author | Micah Anderson <micah@riseup.net> | 2011-02-14 18:32:20 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2011-02-14 18:32:20 -0500 |
| commit | b63233ad123a8692f466883e6603f6feefddb4b8 (patch) | |
| tree | 964214d94530e22aada522cdbaeb1932fee7490a | |
| parent | ff670e5719fb16d72068f143a90b8dad706e6db5 (diff) | |
Revert "debian's puppet initscript has status functionality", this seems to have been a mistake in a merge commit
This reverts commit bb8ede5cfa0bdbdcc0244a590e6453f16d815cb6.
| -rw-r--r-- | manifests/cron/base.pp | 2 | ||||
| -rw-r--r-- | manifests/debian.pp | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/manifests/cron/base.pp b/manifests/cron/base.pp index 74e0225..7daa6fb 100644 --- a/manifests/cron/base.pp +++ b/manifests/cron/base.pp @@ -6,7 +6,7 @@ class puppet::cron::base inherits puppet::base { } case $operatingsystem { - openbsd: { + debian,openbsd,ubuntu: { #it's already disabled } default: { diff --git a/manifests/debian.pp b/manifests/debian.pp index 9653e76..0d1a113 100644 --- a/manifests/debian.pp +++ b/manifests/debian.pp @@ -7,6 +7,11 @@ 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, } case $lsbdistcodename { |