Merge remote-tracking branch 'shared/master'

Conflicts:
	README
	manifests/irc_bot.pp
	manifests/irc_bot/base.pp
	templates/irc_bot/nsa.cfg.erb

1 files changed, 36 insertions, 8 deletions

diff --git a/manifests/irc_bot.pp b/manifests/irc_bot.pp
index a034fe0..7e934ef 100644
--- a/manifests/irc_bot.pp
+++ b/manifests/irc_bot.pp
@@ -1,17 +1,45 @@
-class nagios::irc_bot {
-  if ( ! ($nsa_server and $nsa_nickname and $nsa_channel) ) {
-    fail("Please provide values at least for \$nsa_server, \$nsa_nickname and \$nsa_channel")
+class nagios::irc_bot(
+  $nsa_socket = 'absent',
+  $nsa_server,
+  $nsa_port = 6667,
+  $nsa_nickname,
+  $nsa_password = '',
+  $nsa_channel,
+  $nsa_pidfile = 'absent',
+  $nsa_realname = 'Nagios',
+  $nsa_usenotices = false,
+  $nsa_commandfile = 'absent'
+) {
+  $real_nsa_socket = $nsa_socket ? {
+    'absent' => $::operatingsystem ? {
+      centos => '/var/run/nagios-nsa/nsa.socket',
+      default => '/var/run/nagios3/nsa.socket'
+    },
+    default => $nsa_socket,
+  }
+  $real_nsa_pidfile = $nsa_pidfile ? {
+    'absent' => $::operatingsystem ? {
+      centos => '/var/run/nagios-nsa/nsa.pid',
+      default => '/var/run/nagios3/nsa.pid'
+    },
+    default => $nsa_pidfile,
+  }
+  $real_nsa_commandfile = $nsa_commandfile ? {
+    'absent' => $::operatingsystem ? {
+      centos => '/var/spool/nagios/cmd/nagios.cmd',
+      default => '/var/lib/nagios3/rw/nagios.cmd'
+    },
+    default => $nsa_commandfile,
   }
 
-  case $operatingsystem {
+  case $::operatingsystem {
     centos: {
-      $nsa_default_socket = '/var/run/nagios-nsa/nsa.socket'
-      $nsa_default_pidfile = '/var/run/nagios-nsa/nsa.pid'
       include nagios::irc_bot::centos
     }
+    debian,ubuntu: {
+      include nagios::irc_bot::debian
+    }
     default: {
-      $nsa_default_socket = '/var/run/nagios3/nsa.socket'
-      $nsa_default_pidfile = '/var/run/nagios3/nsa.pid'
       include nagios::irc_bot::base
     }
   }