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, 12 insertions, 10 deletions

diff --git a/manifests/service/imap.pp b/manifests/service/imap.pp
index b703db4..45b667a 100644
--- a/manifests/service/imap.pp
+++ b/manifests/service/imap.pp
@@ -1,24 +1,26 @@
+# check an imap service
 define nagios::service::imap(
-  $ensure = 'present',
-  $host = 'absent',
-  $port = '143',
-  $tls = true,
-  $tls_port = '993'
+  $ensure     = 'present',
+  $host       = 'absent',
+  $port       = '143',
+  $tls        = true,
+  $tls_port   = '993'
 ){
 
   $real_host = $host ? {
     'absent' => $name,
-    default => $host
+    default  => $host
   }
 
+  $tls_ensure = $tls ? {
+    true    => $ensure,
+    default => 'absent'
+  }
   nagios::service{
     "imap_${name}_${port}":
       ensure => $ensure;
     "imaps_${name}_${tls_port}":
-      ensure => $tls ? {
-        true => $ensure,
-        default => 'absent'
-        };
+      ensure => $tls_ensure;
   }
 
   if $ensure != 'absent' {