- removed deprecated options

[packages/awffull.git] / awffull.cron

diff --git a/awffull.cron b/awffull.cron
index 5a336c3b06e112edeb3348bc3b47befb337ae34f..5bbeca6abaea456b415ac97a329f81262fce9705 100644 (file)
--- a/awffull.cron
+++ b/awffull.cron
@@ -5,17 +5,18 @@ CONFIG_LIST=""
 [ -f /etc/sysconfig/awffull ] && . /etc/sysconfig/awffull
 umask 0022
 
+if [ -n "$FORCE_USER" ]; then
+       if [ "$FORCE_USER" != "`id -un`" ]; then
+               echo "Wrong current user. $FORCE_USER is required!"
+               exit 1
+       fi
+fi
+
 if [ -n "$ENABLE" ] && [ "$ENABLE" = "yes" -o "$ENABLE" = "YES" ]; then
        LC_ALL=$LANG
        export LANG
        export LC_ALL
        
-       if [ -n "$REALLY_QUIET" ] && [ "$REALLY_QUIET" = "yes" -o "$REALLY_QUIET" = "YES" ]; then
-               AWFFULL_OPTS="-Q"
-       elif [ -n "$QUIET" ] && [ "$QUIET" = "yes" -o "$QUIET" = "YES" ]; then
-               AWFFULL_OPTS="-q"
-       fi
-       
        if [ -n "$MULTIPLE" ] && [ "$MULTIPLE" = "yes" -o "$MULTIPLE" = "YES" ]; then
                for config in $(ls /etc/awffull/*.conf 2>/dev/null); do\
                        CONFIG_LIST="${CONFIG_LIST} ${config}"
@@ -29,11 +30,11 @@ if [ -n "$ENABLE" ] && [ "$ENABLE" = "yes" -o "$ENABLE" = "YES" ]; then
                        TMPCONFIG=`mktemp -q /var/lib/dnshistory/awffull_config.XXXXXX`
                        LOGFILE=`grep ^LogFile ${singleconfig} | awk '{ print $2;}'`
                        grep -v ^LogFile ${singleconfig} > ${TMPCONFIG}
-                       dnshistory -f ${LOGFILE}
-                       dnshistory -T -f ${LOGFILE} | awffull ${AWFFULL_OPTS} -c ${TMPCONFIG} - ;
+                       nice -n 19 dnshistory -f ${LOGFILE}
+                       nice -n 19 dnshistory -T -f ${LOGFILE} | awffull ${AWFFULL_OPTS} -c ${TMPCONFIG} - ;
                        rm -f ${TMPCONFIG}
                else
-                       awffull ${AWFFULL_OPTS} -c ${singleconfig};
+                       nice -n 19 awffull ${AWFFULL_OPTS} -c ${singleconfig};
                fi
        done
 fi