From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 19 Jan 2013 19:55:09 +0000 (-0200)
Subject: Fixing puppet::master::mongrel::disabled inheritance
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f2ab80a68c04ddc6f5564fff1b31b0437984d9d0;p=puppet-puppet.git

Fixing puppet::master::mongrel::disabled inheritance
---

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,
   }