Merge branch 'immerda_changes' into 'master'

Merge in immerda changes - purging of resources and lots of nice additional checks

Sorry for the big amount of changes, but I think I merged everything nicely with what we have been working. Ok, so what do you get here:

* Purging of unmanaged resources, for that I had to move everything to the default paths of the puppet types, BUT now as soon as a node won't export anymore a resource it will get purged from nagios. No more cleaning up of decomissioned nodes, just remove them from puppet (puppet node clean oldnode.example.com) and they will also disappear from nagios.
* slight changes to the http checks.
** naming the checks consistently, so it's easier to change what they are looking for.
** Also accept 301 & 302 as a good value per default.
** make it possible to define accepted return codes per http & https
* add gpgkey checks, so you won't miss any expiring gpg keys anymore
* add imap login checks, so you can check whether ppl can actually login to your mailserver
* add horde login checks, so you can check whether login to horde still works
* linting wherever I touched something.

See merge request !15

1 files changed, 28 insertions, 27 deletions

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,
+      }
     }
+  }
 }