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, 8 deletions

diff --git a/manifests/init.pp b/manifests/init.pp
index c800637..c4d7725 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -16,18 +16,21 @@
 
 # manage nagios
 class nagios(
-  $httpd = 'apache',
+  $httpd              = 'apache',
   $allow_external_cmd = false,
-  $manage_shorewall = false,
-  $manage_munin = false
+  $manage_shorewall   = false,
+  $manage_munin       = false,
+  $service_atboot     = true,
+  $purge_resources    = true,
+  $gpgkey_checks      = {},
 ) {
   case $nagios::httpd {
     'absent': { }
     'lighttpd': { include ::lighttpd }
     'apache': {
       include ::apache
-      if $::operatingsystem == 'debian' {
-        include nagios::debian::apache
+      if $::operatingsystem == 'Debian' {
+        include ::nagios::debian::apache
       }
     }
     default: { include ::apache }
@@ -35,17 +38,18 @@ class nagios(
   case $::operatingsystem {
     'centos': {
       $cfgdir = '/etc/nagios'
-      include nagios::centos
+      include ::nagios::centos
     }
     'debian': {
       $cfgdir = '/etc/nagios3'
-      include nagios::debian
+      include ::nagios::debian
     }
     default: {
       fail("No such operatingsystem: ${::operatingsystem} yet defined")
     }
   }
   if $manage_munin {
-    include nagios::munin
+    include ::nagios::munin
   }
+  create_resources('nagios::service::gpgkey',$gpgkey_checks)
 }