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, 9 insertions, 7 deletions

diff --git a/manifests/nsca/server.pp b/manifests/nsca/server.pp
index bd5389d..8163eec 100644
--- a/manifests/nsca/server.pp
+++ b/manifests/nsca/server.pp
@@ -1,21 +1,23 @@
+# an nsca server
 class nagios::nsca::server {
-
-  package { 'nsca': ensure => installed }
+  package{'nsca':
+    ensure => installed
+  }
 
   service { 'nsca':
     ensure     => running,
     hasstatus  => false,
     hasrestart => true,
-    require => Package['nsca'],
+    require    => Package['nsca'],
   }
 
   file { '/etc/nsca.cfg':
-    source => [ "puppet:///modules/site_nagios/nsca/{$::fqdn}/nsca.cfg",
-                "puppet:///modules/site_nagios/nsca/nsca.cfg",
-                "puppet:///modules/nagios/nsca/nsca.cfg" ],
+    source => [ "puppet:///modules/site_nagios/nsca/${::fqdn}/nsca.cfg",
+                'puppet:///modules/site_nagios/nsca/nsca.cfg',
+                'puppet:///modules/nagios/nsca/nsca.cfg' ],
     owner  => 'nagios',
     group  => 'nogroup',
-    mode   => '400',
+    mode   => '0400',
     notify => Service['nsca'],
   }