Merge branch 'fix_munin_plguin_install' into 'master'HEADmaster

Fix munin plugin installation when no mumin module is used

when you don't use the munin module, the passenger class will fail using the default values with:

```
Error 400 on SERVER: Puppet::Parser::AST::Resource failed with error ArgumentError: Invalid res
ource type munin::plugin::deploy at /etc/puppet/modules/passenger/manifests/init.pp:72
```

this commit fixed it.

See merge request !1

1 files changed, 11 insertions, 10 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index ff2acb6..ed9b8c3 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -54,21 +54,22 @@ 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 {
-    '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;
+    }
   }
+
 }