SOURCES: mailgraph.init, mailgraph.sysconfig - 2 new sysconfig opt...

[blues]

Author: blues                        Date: Sun Feb 12 20:39:13 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- 2 new sysconfig options

---- Files affected:
SOURCES:
   mailgraph.init (1.10 -> 1.11) , mailgraph.sysconfig (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/mailgraph.init
diff -u SOURCES/mailgraph.init:1.10 SOURCES/mailgraph.init:1.11
--- SOURCES/mailgraph.init:1.10	Tue Dec 20 12:52:20 2005
+++ SOURCES/mailgraph.init	Sun Feb 12 21:39:08 2006
@@ -9,6 +9,9 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
+# Initial values:
+STARTUP_OPTIONS=""
+
 # Get service config
 [ -f /etc/sysconfig/mailgraph ] && . /etc/sysconfig/mailgraph
 
@@ -18,8 +21,16 @@
   start)
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/mailgraph ]; then
+		if [ "${RBL_IS_SPAM}" = "yes" ]; then
+			STARTUP_OPTIONS="${STARTUP_OPTIONS} --rbl-is-spam"
+		fi
+		if [ "${VIRBL_IS_VIRUS}" = "yes" ]; then
+			STARTUP_OPTIONS="${STARTUP_OPTIONS} --virbl-is-virus"	
+		fi
+		
 		msg_starting mailgraph
 		daemon --user stats /usr/bin/mailgraph.pl -d \
+			${STARTUP_OPTIONS} \
 			--daemon-rrd=/var/lib/mailgraph \
 			--daemon-pid=/var/lib/mailgraph/mailgraph.pid \
 			$([ -n "$MAILLOG_FILE" ] && echo -l $MAILLOG_FILE ) 2>&1

================================================================
Index: SOURCES/mailgraph.sysconfig
diff -u SOURCES/mailgraph.sysconfig:1.5 SOURCES/mailgraph.sysconfig:1.6
--- SOURCES/mailgraph.sysconfig:1.5	Tue Dec 20 12:54:35 2005
+++ SOURCES/mailgraph.sysconfig	Sun Feb 12 21:39:08 2006
@@ -8,3 +8,9 @@
 # for example: /var/log/mail/info
 
 #MAILLOG_FILE=/var/log/mail/info
+
+# Count RBL rejects as SPAM (default: no)
+#RBL_IS_SPAM="yes"
+
+# Count blocked viruses rejects as viruses (default: no)
+#VIRBL_IS_VIRUS="yes"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mailgraph.init?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/SOURCES/mailgraph.sysconfig?r1=1.5&r2=1.6&f=u