diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2004-05-11 10:13:59 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2004-05-11 10:13:59 +0000 |
| commit | 8f109fbf0c052144c7df05acea6ece2ecd39e742 (patch) | |
| tree | 3868b4e3981d2cb561b4ebb66317fd923ceff2cc /localwebstats | |
| parent | a392d78ba3173c867a9b2a501445f73fcd6172b5 (diff) | |
Fix jdresolve database use.
Diffstat (limited to 'localwebstats')
| -rwxr-xr-x | localwebstats | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/localwebstats b/localwebstats index 823579a..56007ec 100755 --- a/localwebstats +++ b/localwebstats @@ -3,7 +3,7 @@ # /usr/local/sbin/localwebstats # Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk> # -# $Id: localwebstats,v 1.30 2003-06-28 19:47:07 jonas Exp $ +# $Id: localwebstats,v 1.31 2004-05-11 10:13:59 jonas Exp $ # # Webstats maintenance script # @@ -113,12 +113,9 @@ LOCALCONFIG=/etc/local/webstats.conf # variables and functions too boring to be configurable JDRESOLVE_BIN="/usr/bin/jdresolve" +JDRESOLVE_OPTIONS="-r -t 5" JDRESOLVE_DB="/var/cache/jdresolve/hosts.db" -#JDRESOLVE_OPTIONS="-r -t 5 --database=$JDRESOLVE_DB --dbfirst --expiredb=48" -# DB access doesn't work currently (no output...) -#JDRESOLVE_OPTIONS="-r --database=$JDRESOLVE_DB --dbfirst --expiredb=48" -JDRESOLVE_OPTIONS="-r" -JDRESOLVE_MERGE_OPTIONS="--mergedb --database=$JDRESOLVE_DB" +JDRESOLVE_EXPIRY="48" LOGRESOLVE_BIN="/usr/sbin/logresolve" ANALOG_BIN="/usr/bin/analog" RMAGIC_BIN="/usr/bin/rmagic" @@ -128,11 +125,15 @@ AWSTATS_BIN="/usr/lib/cgi-bin/awstats.pl" function awstats_setlog() { sed -e "s!^\(LogFile=\).*\$!\\1$2!" $1 > $1.tmp; mv $1.tmp $1; } -# Webiste/independent checks +# Website/independent checks test -d $WEBROOT || exit1 "Webroot \"$WEBROOT\" doesn't exist" test -d $LOGROOT || exit1 "Logroot \"$LOGROOT\" doesn't exist" -if [ -x $JDRESOLVE_BIN ]; then - touch $JDRESOLVE_DB || exit1 "Couldn't touch JDRESOLVE_DB" +if [ -x $JDRESOLVE_BIN -a -n "$JDRESOLVE_DB" ]; then + JDRESOLVE_OPTIONS="$JDRESOLVE_OPTIONS --database=\"$JDRESOLVE_DB\"" + test -d $(basedir "$JDRESOLVE_DB") || exit1 "Cache dir for jdresolve doesn't exist" + if [ -n "$JDRESOLVE_EXPIRY" ]; then + jdresolve $JDRESOLVE_OPTIONS --expiredb="$JDRESOLVE_EXPIRY" + fi fi # Generate stats for websites from stdin or all default sites @@ -180,7 +181,7 @@ for WEBSITE in $WEBSITES; do MODLOGAN_TAIL="" AWSTATS_OPTIONS="$AWSTATS_OPTIONS -showsteps" else - JDRESOLVE_OPTIONS="$JDRESOLVE_DB -n" + JDRESOLVE_OPTIONS="$JDRESOLVE_OPTIONS -n" ANALOG_OPTIONS="$ANALOG_OPTIONS -q" RMAGIC_OPTIONS="$RMAGIC_OPTIONS -statistics_Verbose=NONE" WEBALIZER_OPTIONS="$WEBALIZER_OPTIONS -Q" @@ -374,9 +375,6 @@ ShowFlagLinks=0 if [ -x $JDRESOLVE_BIN ]; then [ $DEBUG ] && echo "$WEBSITE: DNS-resolve new logdata using jdresolve" -# DB access doesn't work currently (no output...) -# logcontent $LOGROOT $WEBROOT $WEBSITE | $JDRESOLVE_BIN $JDRESOLVE_OPTIONS - >> $LOGDATA -# jdresolve $JDRESOLVE_MERGE_OPTIONS $LOGDATA logcontent $LOGROOT $WEBROOT $WEBSITE | $JDRESOLVE_BIN $JDRESOLVE_OPTIONS - >> $LOGDATA elif [ -x $LOGRESOLVE_BIN ]; then [ $DEBUG ] && echo "$WEBSITE: DNS-resolve new logdata using logresolve" |