From 1bdc529bc2ac20bfdc38f8c07cf630a1da27692d Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sun, 10 May 2015 16:29:07 +0200
Subject: only install munin plugins in $manage_munin=true

---
 manifests/init.pp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index ff2acb6..7f4f48c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -60,15 +60,16 @@ class passenger (
     if $passenger_stats_munin_config == '' {
       $passenger_stats_munin_config = "user root\nenv.passenger_status $passenger_bin_path/passenger-status"
     }
-  }
 
-  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;
+    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;
+    }
   }
+
 }
 
-- 
cgit v1.2.3


From d6678678989e30b799d1b82b232e040446898de2 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sun, 10 May 2015 16:30:01 +0200
Subject: linted init.pp

---
 manifests/init.pp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 7f4f48c..ed9b8c3 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -54,11 +54,11 @@ class passenger (
 
   if $manage_munin {
     if $passenger_memory_munin_config == '' {
-      $passenger_memory_munin_config = "user root\nenv.passenger_memory_stats $passenger_bin_path/passenger-memory-stats"
+      $passenger_memory_munin_config = "user root\nenv.passenger_memory_stats ${passenger_bin_path}/passenger-memory-stats"
     }
 
     if $passenger_stats_munin_config == '' {
-      $passenger_stats_munin_config = "user root\nenv.passenger_status $passenger_bin_path/passenger-status"
+      $passenger_stats_munin_config = "user root\nenv.passenger_status ${passenger_bin_path}/passenger-status"
     }
 
     munin::plugin::deploy {
-- 
cgit v1.2.3