packages: nagios-plugin-check_rbl/check_rbl.cfg, nagios-plugin-check_rbl/na...

[glen]

Author: glen                         Date: Thu Feb  4 13:13:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move the ini file usage to check_rbl command definition for easier overriding host address; rel 2

---- Files affected:
packages/nagios-plugin-check_rbl:
   check_rbl.cfg (1.5 -> 1.6) , nagios-plugin-check_rbl.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/nagios-plugin-check_rbl/check_rbl.cfg
diff -u packages/nagios-plugin-check_rbl/check_rbl.cfg:1.5 packages/nagios-plugin-check_rbl/check_rbl.cfg:1.6
--- packages/nagios-plugin-check_rbl/check_rbl.cfg:1.5	Wed Feb  3 13:46:23 2010
+++ packages/nagios-plugin-check_rbl/check_rbl.cfg	Thu Feb  4 14:13:30 2010
@@ -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 @@
 	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
 }

================================================================
Index: packages/nagios-plugin-check_rbl/nagios-plugin-check_rbl.spec
diff -u packages/nagios-plugin-check_rbl/nagios-plugin-check_rbl.spec:1.5 packages/nagios-plugin-check_rbl/nagios-plugin-check_rbl.spec:1.6
--- packages/nagios-plugin-check_rbl/nagios-plugin-check_rbl.spec:1.5	Wed Feb  3 13:46:35 2010
+++ packages/nagios-plugin-check_rbl/nagios-plugin-check_rbl.spec	Thu Feb  4 14:13:30 2010
@@ -8,7 +8,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
@@ -88,6 +88,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/02/04 13:13:30  glen
+- move the ini file usage to check_rbl command definition for easier overriding host address; rel 2
+
 Revision 1.5  2010/02/03 12:46:35  glen
 - release 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_rbl/check_rbl.cfg?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-plugin-check_rbl/nagios-plugin-check_rbl.spec?r1=1.5&r2=1.6&f=u