merge with shared-modules/passenger

4 files changed, 67 insertions, 10 deletions

diff --git a/manifests/base.pp b/manifests/base.pp
new file mode 100644
index 0000000..34ef976
--- /dev/null
+++ b/manifests/base.pp
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000..f351111
--- /dev/null
+++ b/manifests/debian.pp
@@ -0,0 +1,19 @@
+class passenger::debian inherits passenger::base {
+
+  if !defined(Package["libapache2-mod-passenger"]) {
+    if $passenger_ensure_version == '' { $passenger_ensure_version = 'installed' }
+    apache::debian::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 acf3b30..59cdabd 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,16 +1,21 @@
-#
 # passenger module
 #
-# Copyright 2009, admin(at)immerda.ch
-#
-# This program is free software; you can redistribute 
-# it and/or modify it under the terms of the GNU 
-# General Public License version 3 as published by 
-# the Free Software Foundation.
+# Copyright 2010, Riseup Networks
+# Micah Anderson micah(at)riseup.net
 #
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
 
-class passenger{
-  package{'passenger':
-    ensure => installed,
+class passenger {
+  
+  case $operatingsystem {
+    debian: { include passenger::debian }
+    default: { include passenger::base }
   }
+
+  if $use_munin {
+    include passenger::munin
+  }  
+
 }
diff --git a/manifests/munin.pp b/manifests/munin.pp
new file mode 100644
index 0000000..9b6cc68
--- /dev/null
+++ b/manifests/munin.pp
@@ -0,0 +1,20 @@
+class passenger::munin {
+
+  case $passenger_memory_munin_config { '':
+    { $passenger_memory_munin_config = "user root\nenv.passenger_memory_stats /usr/sbin/passenger-memory-stats" }
+  }
+
+  case $passenger_stats_munin_config { '':
+    { $passenger_stats_munin_config = "user root\n" }
+  }
+  
+  munin::plugin::deploy {
+    'passenger_memory_stats':
+      source => "passenger/munin/passenger_memory_stats",
+      config => $passenger_memory_munin_config;
+    'passenger_stats':
+      source => "passenger/munin/passenger_stats",
+      config => $passenger_stats_munin_config;
+  }
+
+}