- move the ini file usage to check_rbl command definition for easier overriding host...

Changed files:
    check_rbl.cfg -> 1.6
    nagios-plugin-check_rbl.spec -> 1.6

diff --git a/check_rbl.cfg b/check_rbl.cfg
index c86295adc02b0d75b6ccbb2f7548641940234733..12ee3413904efc03431d49b2712a1f8646aab55f 100644 (file)
--- a/check_rbl.cfg
+++ b/check_rbl.cfg
@@ -2,7 +2,7 @@
 # check_rbl!-s RBLSERVER -s RBLSERVER ...
 define command {
        command_name    check_rbl
-       command_line    /usr/lib/nagios/plugins/check_rbl -H $HOSTADDRESS$ $ARG1$
+       command_line    /usr/lib/nagios/plugins/check_rbl!--extra-opts=rbl@/etc/nagios/plugins/check_rbl.ini -t 60 -H $HOSTADDRESS$ $ARG1$
 }
 
 # service definition
@@ -23,5 +23,5 @@ define service {
        max_check_attempts      2
 
        ; use [rbl] section for servers list
-       check_command           check_rbl!--extra-opts=rbl@/etc/nagios/plugins/check_rbl.ini
+       check_command           check_rbl
 }

diff --git a/nagios-plugin-check_rbl.spec b/nagios-plugin-check_rbl.spec
index 92b2901aa8bfa30d90e336230b49b9c7a82f301f..566cd58dce018c6f6b960ad3a6a59ea1f6efe539 100644 (file)
--- a/nagios-plugin-check_rbl.spec
+++ b/nagios-plugin-check_rbl.spec
@@ -7,7 +7,7 @@
 Summary:       check_rbl is a Nagios plugin to check if an SMTP server is blacklisted
 Name:          nagios-plugin-%{plugin}
 Version:       1.1.0
-Release:       1
+Release:       2
 License:       GPL
 Group:         Networking
 Source0:       https://trac.id.ethz.ch/projects/nagios_plugins/downloads/%{plugin}-%{version}.tar.gz