summaryrefslogtreecommitdiff
path: root/manifests/master
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-19 17:55:09 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-19 17:55:09 -0200
commitf2ab80a68c04ddc6f5564fff1b31b0437984d9d0 (patch)
tree09bbac204d175d2f05fc82cd6dbe6882069d2211 /manifests/master
parentdac717d08540f1e94b3ea97fe20a1d28a59777fe (diff)
downloadpuppet-puppet-f2ab80a68c04ddc6f5564fff1b31b0437984d9d0.tar.gz
puppet-puppet-f2ab80a68c04ddc6f5564fff1b31b0437984d9d0.tar.bz2
Fixing puppet::master::mongrel::disabled inheritance
Diffstat (limited to 'manifests/master')
-rw-r--r--manifests/master/mongrel.pp6
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/master/mongrel.pp b/manifests/master/mongrel.pp
index 5addb6f..4a7708d 100644
--- a/manifests/master/mongrel.pp
+++ b/manifests/master/mongrel.pp
@@ -39,15 +39,15 @@ class puppet::master::mongrel {
}
-class puppet::master::mongrel::disabled {
+class puppet::master::mongrel::disabled inherits puppet::master::mongrel {
include nginx::puppetmaster::disabled
Service['puppetmaster'] {
+ enable => false,
ensure => stopped,
}
- Package['puppetmaster'] {
- enable => false,
+ Package['puppetmaster', 'mongrel'] {
ensure => absent,
}