there was a start at abstracting out the classes, but this is not needed at this point, so I've pulled it all in to simplify it

3 files changed, 9 insertions, 34 deletions

diff --git a/manifests/base.pp b/manifests/base.pp
deleted file mode 100644
index 65971a7..0000000
--- a/manifests/base.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-class passenger::base {
-
-  include apache
-  
-  apache::config::file { 'mod_passenger':
-    ensure => present,
-    source => [ "puppet://${server}/modules/site_passenger/${fqdn}/mod_passenger.conf",
-                "puppet://${server}/modules/site_passenger/mod_passenger.conf",
-                "puppet://${server}/modules/passenger/mod_passenger.conf",
-              ],
-  }
-
-}
diff --git a/manifests/debian.pp b/manifests/debian.pp
deleted file mode 100644
index f82c63f..0000000
--- a/manifests/debian.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-class passenger::debian inherits passenger::base {
-
-  if !defined(Package["libapache2-mod-passenger"]) {
-    if $passenger_ensure_version == '' { $passenger_ensure_version = 'installed' }
-    apache::debian::module { 'passenger':
-      module => 'passenger',
-      ensure => $passenger_ensure_version,
-      package_name => 'libapache2-mod-passenger';
-    }
-  }
-
-  if !defined(Package["librack-ruby"]) {
-    if $librack_ensure_version == '' { $librack_ensure_version = 'installed' }
-    package {
-    "librack-ruby":
-      ensure => $librack_ensure_version;
-    }
-  }
-
-}
diff --git a/manifests/init.pp b/manifests/init.pp
index d4132d3..22be7cf 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -37,7 +37,15 @@ class passenger (
         ensure => $librack_ensure_version;
     }
   }
-  
+
+  apache::config::file { 'mod_passenger':
+    ensure => present,
+    source => [ "puppet://${server}/modules/site_passenger/${fqdn}/mod_passenger.conf",
+                "puppet://${server}/modules/site_passenger/mod_passenger.conf",
+                "puppet://${server}/modules/passenger/mod_passenger.conf",
+              ],
+  }
+
   if $use_munin {
     case $passenger_memory_munin_config { '':
       { $passenger_memory_munin_config = "user root\nenv.passenger_memory_stats /usr/sbin/passenger-memory-stats" }