Merge branch 'master' into riseup

4 files changed, 35 insertions, 12 deletions

diff --git a/manifests/base.pp b/manifests/base.pp
index 8b96308..589e98b 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -26,6 +26,13 @@ class nagios::base {
             mode => 0644, owner => root, group => root;
     }    
 
+    file { 'nagios_commands_cfg':
+            path   => "${nagios::defaults::vars::int_nagios_cfgdir}/commands.cfg",
+            ensure => present,
+            notify => Service['nagios'],
+            mode   => 0644, owner => root, group => root;
+    }
+
     file { 'nagios_cgi_cfg':
         path => "${nagios::defaults::vars::int_nagios_cfgdir}/cgi.cfg",
         source => [ "puppet:///modules/site-nagios/configs/${fqdn}/cgi.cfg",
diff --git a/manifests/command/imap_pop3.pp b/manifests/command/imap_pop3.pp
index 174b09c..3735136 100644
--- a/manifests/command/imap_pop3.pp
+++ b/manifests/command/imap_pop3.pp
@@ -1,7 +1,15 @@
 class nagios::command::imap_pop3 {
-  nagios_command{
-    'check_imap':
-      command_line => '$USER1$/check_imap -H $ARG1$ -p $ARG2$';
+  case $operatingsystem {
+    debian,ubuntu: { }  # Debian/Ubuntu already define those checks
+    default: {
+      nagios_command {
+        'check_imap':
+          command_line => '$USER1$/check_imap -H $ARG1$ -p $ARG2$';
+      }
+    }
+  }
+
+  nagios_command {
     'check_imap_ssl':
       command_line => '$USER1$/check_imap -H $ARG1$ -p $ARG2$ -S';
     'check_pop3':
diff --git a/manifests/command/smtp.pp b/manifests/command/smtp.pp
index 04f8543..29d97f8 100644
--- a/manifests/command/smtp.pp
+++ b/manifests/command/smtp.pp
@@ -1,14 +1,22 @@
 class nagios::command::smtp {
-  nagios_command{
-    'check_smtp':
-      command_line => '$USER1$/check_smtp -H $ARG1$ -p $ARG2$';
+  case $operatingsystem {
+    debian,ubuntu: { }  # Debian/Ubuntu already define those checks
+    default: {
+      nagios_command {
+        'check_smtp':
+           command_line => '$USER1$/check_smtp -H $ARG1$ -p $ARG2$';
+        'check_ssmtp':
+           command_line => '$USER1$/check_ssmtp -H $ARG1$ -p $ARG2$ -S';
+      }
+    }
+  }
+
+  nagios_command {
     'check_smtp_tls':
-      command_line => '$USER1$/check_smtp -H $ARG1$ -p $ARG2$ -S';
+       command_line => '$USER1$/check_smtp -H $ARG1$ -p $ARG2$ -S';
     'check_smtp_cert':
-      command_line => '$USER1$/check_smtp -H $ARG1$ -p $ARG2$ -S -D $ARG3$';
-    'check_ssmtp':
-      command_line => '$USER1$/check_ssmtp -H $ARG1$ -p $ARG2$ -S';
+       command_line => '$USER1$/check_smtp -H $ARG1$ -p $ARG2$ -S -D $ARG3$';
     'check_ssmtp_cert':
-      command_line => '$USER1$/check_ssmtp -H $ARG1$ -p $ARG2$ -S -D $ARG3$';
+       command_line => '$USER1$/check_ssmtp -H $ARG1$ -p $ARG2$ -S -D $ARG3$';
   }
 }
diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp
index ea30a07..1213485 100644
--- a/manifests/defaults/commands.pp
+++ b/manifests/defaults/commands.pp
@@ -131,7 +131,7 @@ class nagios::defaults::commands {
 
     nagios_command {
         'notify-host-by-email':
-            command_line => "/usr/bin/printf \"%b\" \"***** Nagios *****\\n\\nNotification Type: \$NOTIFICATIONTYPE\$\\nHost: \\$HOSTNAME\\$\\nState: \$HOSTSTATE\$\\nAddress: \$HOSTADDRESS\$\\nInfo: \$HOSTOUTPUT\$\\n\\nDate/Time: \$LONGDATETIME\$\\n\" | ${mail_cmd_location} -s \"** \$NOTIFICATIONTYPE\$ Host Alert: \$HOSTNAME\$ is \$HOSTSTATE\$ **\" \$CONTACTEMAIL\$";
+            command_line => "/usr/bin/printf \"%b\" \"***** Nagios *****\\n\\nNotification Type: \$NOTIFICATIONTYPE\$\\nHost: \$HOSTNAME\$\\nState: \$HOSTSTATE\$\\nAddress: \$HOSTADDRESS\$\\nInfo: \$HOSTOUTPUT\$\\n\\nDate/Time: \$LONGDATETIME\$\\n\" | ${mail_cmd_location} -s \"** \$NOTIFICATIONTYPE\$ Host Alert: \$HOSTNAME\$ is \$HOSTSTATE\$ **\" \$CONTACTEMAIL\$";
 	    'notify-service-by-email':
         	command_line => "/usr/bin/printf \"%b\" \"***** Nagios *****\\n\\nNotification Type: \$NOTIFICATIONTYPE\$\\n\\nService: \$SERVICEDESC\$\\nHost: \$HOSTALIAS\$\\nAddress: \$HOSTADDRESS\$\\nState: \$SERVICESTATE\$\\n\\nDate/Time: \$LONGDATETIME\$\\n\\nAdditional Info:\\n\\n\$SERVICEOUTPUT\$\" | ${mail_cmd_location} -s \"** \$NOTIFICATIONTYPE\$ Service Alert: \$HOSTALIAS\$/\$SERVICEDESC\$ is \$SERVICESTATE\$ **\" \$CONTACTEMAIL\$";
 	}