2 files changed, 15 insertions, 1 deletions
diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp
index f542d7b..f5fface 100644
--- a/manifests/defaults/commands.pp
+++ b/manifests/defaults/commands.pp
@@ -6,6 +6,12 @@ class nagios::defaults::commands {
   # common service commands
   case $operatingsystem {
       debian,ubuntu: {
+        # debian and ubuntu ship the nagios::command::smtp and
+        # nagios::command::imap_pop3 commands in the nagios-plugins packages,
+        # which are placed in /etc/nagios-plugins/config/mail.cfg, however they
+        # are inferior to the ones provided in this module below because they do
+        # not provide port options, so we just remove them
+        file { '/etc/nagios-plugins/config/mail.cfg': ensure => absent; }
         nagios_command {
           check_dummy:
             command_line => '$USER1$/check_dummy $ARG1$';
@@ -29,6 +35,8 @@ class nagios::defaults::commands {
             command_line => '$USER1$/check_tcp -H $ARG1$ -p $ARG2$';
           check_jabber:
             command_line => '$USER1$/check_jabber -H $ARG1$';
+          check_git:
+            command_line => '$USER1$/check_tcp -H $ARG1$ -p 9418';
         }
       }
       default: {
@@ -109,11 +117,15 @@ class nagios::defaults::commands {
 
         # from mysql module
         check_mysql_health:
-           command_line => '$USER1$/check_mysql_health --hostname $ARG1$ --port $ARG2$ --username $ARG3$ --password $ARG4$ --mode $ARG5$ --database $ARG6$';
+           command_line => '$USER1$/check_mysql_health --hostname $ARG1$ --port $ARG2$ --username $ARG3$ --password $ARG4$ --mode $ARG5$ --database $ARG6$ $ARG7$ $ARG8$';
 
         # better check_dns
         check_dns2:
           command_line => '$USER1$/check_dns2 -c $ARG1$ A $ARG2$';
+
+        # dnsbl checking
+        check_dnsbl:
+          command_line => '$USER1$/check_dnsbl -H $ARG1$';
     }
 
     # notification commands
diff --git a/manifests/defaults/plugins.pp b/manifests/defaults/plugins.pp
index 842f9ce..18f8161 100644
--- a/manifests/defaults/plugins.pp
+++ b/manifests/defaults/plugins.pp
@@ -5,6 +5,8 @@ class nagios::defaults::plugins {
       source => 'nagios/plugins/check_mysql_health';
     'check_dns2':
       source => 'nagios/plugins/check_dns2';
+    'check_dnsbl':
+      source => 'nagios/plugins/check_dnsbl';
   }
 
 }