diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2002-02-05 13:12:08 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2002-02-05 13:12:08 +0000 |
| commit | 79c5857410cd5616ccacf480866f19061369797e (patch) | |
| tree | 859581ae4ae1ec9ad0aaa7c2ac0e11be29b08428 /localwebstats | |
| parent | 7115b415fabc79d7767c344cd861be96167e0590 (diff) | |
Misc updates tp localwebstats.
Diffstat (limited to 'localwebstats')
| -rwxr-xr-x | localwebstats | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/localwebstats b/localwebstats index 3212139..936f854 100755 --- a/localwebstats +++ b/localwebstats @@ -162,7 +162,7 @@ for WEBSITE in $WEBSITES; do LOGDATATMP="$STATSDIR/rawlog_incoming.txt" touch $LOGDATARESOLVED $LOGDATA $LOGDATATMP || exit1 "Couldn't touch LOGDATA files." - if [ $stamp = "init" ]; then + if [ $stamp = "init" -o $stamp = "update" ]; then logcontentresolved $LOGROOT $WEBROOT $WEBSITE >> $LOGDATARESOLVED if [ -x $ANALOG_BIN ]; then [ $DEBUG ] && echo "$WEBSITE: Create/update analog config" @@ -177,8 +177,9 @@ LANGUAGE DANISH "\ > $ANALOG_CFG [ -s $ANALOG_CFG.local ] && cat $ANALOG_CFG.local >> $ANALOG_CFG - mkdir $STATSDIR/analog + [ -d $STATSDIR/analog ] || mkdir $STATSDIR/analog [ $DEBUG ] && echo "$WEBSITE: Create initial analog stats" + rm -f $STATSDIR/analog/cache.data $ANALOG_BIN $ANALOG_OPTIONS -C"LOGFILE none" -C"LOGFILE $LOGDATARESOLVED" -C"CACHEOUTFILE $STATSDIR/analog/cache.data" -C"OUTFILE $STATSDIR/analog/index.html" fi if [ -x $RMAGIC_BIN -a -x $ANALOG_BIN ]; then @@ -203,7 +204,7 @@ File_Out = navfile.html "\ > $RMAGIC_CFG [ -s $RMAGIC_CFG.local ] && $RMAGIC_OPTIONS="$RMAGIC_OPTIONS -statistics_Include=$RMAGIC_CFG.local" - mkdir $STATSDIR/rmagic + [ -d $STATSDIR/rmagic ] || mkdir $STATSDIR/rmagic [ $DEBUG ] && echo "$WEBSITE: Create initial Report Magic stats" $ANALOG_BIN $ANALOG_OPTIONS -C"LOGFILE none" -C"CACHEFILE $STATSDIR/analog/cache.data" -C"LANGUAGE ENGLISH" -C"OUTPUT COMPUTER" -C"OUTFILE $STATSDIR/rmagic/report.dat" $RMAGIC_BIN $RMAGIC_OPTIONS $RMAGIC_CFG @@ -220,7 +221,7 @@ HideReferrer $DOMAIN/ "\ > $WEBALIZER_CFG [ -s $WEBALIZER_CFG.local ] && cat $WEBALIZER_CFG.local >> $WEBALIZER_CFG - mkdir $STATSDIR/webalizer + [ -d $STATSDIR/webalizer ] || mkdir $STATSDIR/webalizer [ $DEBUG ] && echo "$WEBSITE: Create initial Webalizer stats" cat $LOGDATARESOLVED | $WEBALIZER_BIN $WEBALIZER_OPTIONS -N 0 - || true fi @@ -260,7 +261,7 @@ inputfile = - "\ > $MODLOGAN_CFG [ -s $MODLOGAN_CFG.local ] && cat $MODLOGAN_CFG.local >> $MODLOGAN_CFG - mkdir $STATSDIR/modlogan + [ -d $STATSDIR/modlogan ] || mkdir $STATSDIR/modlogan [ $ROOT ] && chown $user:$group $STATSDIR/modlogan [ $DEBUG ] && echo "$WEBSITE: Create initial ModLogAn stats" if [ $ROOT ]; then @@ -293,7 +294,7 @@ ShowLinksOnUrl=1 ShowFlagLinks=0 "\ >/etc/awstats/awstats.$WEBSITE.conf - mkdir $STATSDIR/awstats + [ -d $STATSDIR/awstats ] || mkdir $STATSDIR/awstats [ $DEBUG ] && echo "$WEBSITE: Create initial AWStats stats" awstats_setlog /etc/awstats/awstats.$WEBSITE.conf $LOGDATARESOLVED $AWSTATS_BIN -config=$WEBSITE $AWSTATS_OPTIONS -output > $STATSDIR/awstats/index.html @@ -329,14 +330,14 @@ ShowFlagLinks=0 fi if [ -x $WEBALIZER_BIN ]; then [ $DEBUG ] && echo "$WEBSITE: Update Webalog stats" - zcat -f $LOGDATA | $WEBALIZER_BIN $WEBALIZER_OPTIONS -N 0 - + cat $LOGDATA | $WEBALIZER_BIN $WEBALIZER_OPTIONS -N 0 - fi if [ -x $MODLOGAN_BIN ]; then [ $DEBUG ] && echo "$WEBSITE: Update ModLogAn stats" if [ $ROOT ]; then - cat $LOGDATARESOLVED | su $user -c "$MODLOGAN_BIN $MODLOGAN_OPTIONS" + cat $LOGDATA | su $user -c "$MODLOGAN_BIN $MODLOGAN_OPTIONS" else - cat $LOGDATARESOLVED | $MODLOGAN_BIN $MODLOGAN_OPTIONS + cat $LOGDATA | $MODLOGAN_BIN $MODLOGAN_OPTIONS fi fi if [ -x $AWSTATS_BIN ]; then |