3 files changed, 17 insertions, 18 deletions
diff --git a/manifests/master/mongrel.pp b/manifests/master/mongrel.pp
index 987c333..5cdf551 100644
--- a/manifests/master/mongrel.pp
+++ b/manifests/master/mongrel.pp
@@ -30,20 +30,3 @@ class puppet::master::mongrel {
   }
 
 }
-
-class puppet::master::mongrel::disabled inherits puppet::master::mongrel {
-  include nginx::puppetmaster::disabled
-
-  Service['puppetmaster'] {
-    enable => false,
-    ensure => stopped,
-  }
-
-  Package['puppetmaster', 'mongrel'] {
-    ensure => absent,
-  }
-
-  File['/etc/cron.d/puppetmaster'] {
-    ensure => absent,
-  }
-}
diff --git a/manifests/master/mongrel/disabled.pp b/manifests/master/mongrel/disabled.pp
new file mode 100644
index 0000000..84edfd3
--- /dev/null
+++ b/manifests/master/mongrel/disabled.pp
@@ -0,0 +1,16 @@
+class puppet::master::mongrel::disabled inherits puppet::master::mongrel {
+  include nginx::puppetmaster::disabled
+
+  Service['puppetmaster'] {
+    enable => false,
+    ensure => stopped,
+  }
+
+  Package['puppetmaster', 'mongrel'] {
+    ensure => absent,
+  }
+
+  File['/etc/cron.d/puppetmaster'] {
+    ensure => absent,
+  }
+}
diff --git a/manifests/master/passenger.pp b/manifests/master/passenger.pp
index 221a7a2..01f1dac 100644
--- a/manifests/master/passenger.pp
+++ b/manifests/master/passenger.pp
@@ -4,7 +4,7 @@ class puppet::master::passenger {
   include puppet::master::mongrel::disabled
 
   # then include puppet class
-  include puppetd
+  include puppet::daemon
 
   package { 'puppetmaster-passenger':
     ensure => installed,