Merge branch 'develop'

2 files changed, 20 insertions, 0 deletions

diff --git a/puppet/modules/passenger b/puppet/modules/passenger
deleted file mode 160000
-Subproject d1b46de84acf4d9e3582b64e019935fb1125f9b
diff --git a/puppet/modules/passenger/manifests/munin.pp b/puppet/modules/passenger/manifests/munin.pp
new file mode 100644
index 00000000..36bc53f2
--- /dev/null
+++ b/puppet/modules/passenger/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;
+  }
+
+}