From 94b40fa2975cf537dd97ac2484670bc944fa09f4 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Sat, 28 Nov 2015 17:41:37 +0100
Subject: linting for future parser

---
 manifests/nrpe/command.pp | 55 ++++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

(limited to 'manifests/nrpe/command.pp')

diff --git a/manifests/nrpe/command.pp b/manifests/nrpe/command.pp
index e6ebdae..196996c 100644
--- a/manifests/nrpe/command.pp
+++ b/manifests/nrpe/command.pp
@@ -1,33 +1,34 @@
+# manage an nrpe command
 define nagios::nrpe::command (
-    $ensure = present,
-    $command_line = '',
-    $source = '' )
-{
-    if ($command_line == '' and $source == '') {
-        fail ( "Either one of 'command_line' or 'source' must be given to nagios::nrpe::command." )
-    }
+  $ensure       = present,
+  $command_line = '',
+  $source       = '',
+){
+  if ($command_line == '' and $source == '') {
+    fail('Either one of $command_line or $source must be given to nagios::nrpe::command.' )
+  }
 
-    if $nagios_nrpe_cfg_dir == '' {
-        $nagios_nrpe_cfgdir = $nagios::nrpe::base::nagios_nrpe_cfgdir
-    }
+  $nagios_nrpe_cfgdir = $nagios::nrpe::base::nagios_nrpe_cfgdir
 
-    file { "$nagios_nrpe_cfgdir/nrpe.d/${name}_command.cfg":
-                    ensure => $ensure,
-                    mode => 644, owner => root, group => 0,
-                    notify => Service['nagios-nrpe-server'],
-                    require => File [ "$nagios_nrpe_cfgdir/nrpe.d" ]
-    }
+  file{"${nagios_nrpe_cfgdir}/nrpe.d/${name}_command.cfg":
+    ensure  => $ensure,
+    notify  => Service['nagios-nrpe-server'],
+    require => File ["${nagios_nrpe_cfgdir}/nrpe.d" ],
+    owner   => 'root',
+    group   => 0,
+    mode    => '0644';
+  }
 
-    case $source {
-        '': {
-             File["$nagios_nrpe_cfgdir/nrpe.d/${name}_command.cfg"] {
-                content => template( "nagios/nrpe/nrpe_command.erb" ),
-            }
-        }
-        default: {
-            File["$nagios_nrpe_cfgdir/nrpe.d/${name}_command.cfg"] {
-                source => $source,
-            }
-        }
+  case $source {
+    '': {
+      File["${nagios_nrpe_cfgdir}/nrpe.d/${name}_command.cfg"] {
+        content => template('nagios/nrpe/nrpe_command.erb'),
+      }
+    }
+    default: {
+      File["${nagios_nrpe_cfgdir}/nrpe.d/${name}_command.cfg"] {
+        source => $source,
+      }
     }
+  }
 }
-- 
cgit v1.2.3


From a534036c8d036275aa802f86470d67e4ee46db96 Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Sun, 31 Jan 2016 18:19:57 -0500
Subject: parametrize nagios::nrpe

the current code for configuring NRPE is still relying on global
variables. This is not working at all with puppet 3.x and forward, so in
order to make this code functional, we need to parametrize values that
are used.
---
 manifests/nrpe/command.pp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'manifests/nrpe/command.pp')

diff --git a/manifests/nrpe/command.pp b/manifests/nrpe/command.pp
index 196996c..bdd89a7 100644
--- a/manifests/nrpe/command.pp
+++ b/manifests/nrpe/command.pp
@@ -8,12 +8,12 @@ define nagios::nrpe::command (
     fail('Either one of $command_line or $source must be given to nagios::nrpe::command.' )
   }
 
-  $nagios_nrpe_cfgdir = $nagios::nrpe::base::nagios_nrpe_cfgdir
+  $cfg_dir = $nagios::nrpe::real_cfg_dir
 
-  file{"${nagios_nrpe_cfgdir}/nrpe.d/${name}_command.cfg":
+  file{"${cfg_dir}/nrpe.d/${name}_command.cfg":
     ensure  => $ensure,
     notify  => Service['nagios-nrpe-server'],
-    require => File ["${nagios_nrpe_cfgdir}/nrpe.d" ],
+    require => File ["${cfg_dir}/nrpe.d" ],
     owner   => 'root',
     group   => 0,
     mode    => '0644';
@@ -21,12 +21,12 @@ define nagios::nrpe::command (
 
   case $source {
     '': {
-      File["${nagios_nrpe_cfgdir}/nrpe.d/${name}_command.cfg"] {
+      File["${cfg_dir}/nrpe.d/${name}_command.cfg"] {
         content => template('nagios/nrpe/nrpe_command.erb'),
       }
     }
     default: {
-      File["${nagios_nrpe_cfgdir}/nrpe.d/${name}_command.cfg"] {
+      File["${cfg_dir}/nrpe.d/${name}_command.cfg"] {
         source => $source,
       }
     }
-- 
cgit v1.2.3