Merge branch 'plugin_path' into 'master'

Plugin path

Avoid using lib64 in the path for x86_64 architecture when using debian. this path is not available anymore starting with debian wheezy.
Then lint the file to make it easier to read / maintain.

This is a followup of https://labs.riseup.net/code/issues/4237

See merge request !7

1 files changed, 21 insertions, 13 deletions

diff --git a/manifests/plugin.pp b/manifests/plugin.pp
index d32606b..f2e4ed2 100644
--- a/manifests/plugin.pp
+++ b/manifests/plugin.pp
@@ -1,19 +1,27 @@
 define nagios::plugin(
-    $source = 'absent',
-    $ensure = present
+  $source = 'absent',
+  $ensure = present
 ){
+  if $::hardwaremodel == 'x86_64' and $::operatingsystem != 'debian' {
+    $real_path = "/usr/lib64/nagios/plugins/${name}"
+  }
+  else {
+    $real_path = "/usr/lib/nagios/plugins/${name}"
+  }
+
+  $real_source = $source ? {
+    'absent' => "puppet:///modules/nagios/plugins/${name}",
+    default => "puppet:///modules/${source}"
+  }
+
   file{$name:
-    path => $::hardwaremodel ? {
-      'x86_64' => "/usr/lib64/nagios/plugins/${name}",
-      default => "/usr/lib/nagios/plugins/${name}",
-    },
-    ensure => $ensure,
-    source => $source ? {
-      'absent' => "puppet:///modules/nagios/plugins/${name}",
-      default => "puppet:///modules/${source}"
-    },
-    tag => 'nagios_plugin',
+    ensure  => $ensure,
+    path    => $real_path,
+    source  => $real_source,
+    tag     => 'nagios_plugin',
     require => Package['nagios-plugins'],
-    owner => root, group => 0, mode => 0755;
+    owner   => 'root',
+    group   => 0,
+    mode    => '0755';
   }
 }