localwebstats updates:

  - Add support for Report Magic (in english...).
  - Force overwrite of LOGDATA gzip'ing.

1 files changed, 39 insertions, 1 deletions

diff --git a/localwebstats b/localwebstats
index 2dec780..3357b9e 100755
--- a/localwebstats
+++ b/localwebstats
@@ -66,6 +66,7 @@ function logcontent()		{ for file in `logfilesgz $1 $2`; do zcat $file; done; fo
 function host()			{ cat $1/VIRTUAL/$2/hostname || exit1 "Unable to get hostname for virtual host."; }
 function domain()		{ cat $1/VIRTUAL/$2/domainname || exit1 "Unable to get domainname for virtual host."; }
 function analog_cfg()		{ echo /etc/analog_$2.conf; }
+function rmagic_cfg()		{ echo /etc/rmagic/rmagic_$2.conf; }
 function webalizer_cfg()	{ echo /etc/webalizer_$2.conf; }
 
 # The above can be overridden in /etc/local/www
@@ -82,6 +83,7 @@ JDRESOLVE_OPTIONS="-r"
 JDRESOLVE_MERGE_OPTIONS="--mergedb --database=$JDRESOLVE_DB"
 LOGRESOLVE_BIN="/usr/sbin/logresolve"
 ANALOG_BIN="/usr/bin/analog"
+RMAGIC_BIN="/usr/bin/rmagic"
 WEBALIZER_BIN="/usr/bin/webalizer"
 AWSTATS_BIN="/usr/lib/cgi-bin/awstats.pl"
 
@@ -105,6 +107,7 @@ for WEBSITE in $WEBSITES; do
 # FIXME	test -d $STATSDIR/.. || exit1 "Directory above STATSDIR doesn't exist."
 
 	ANALOG_CFG=$(analog_cfg $WEBROOT $WEBSITE) || exit1 "Unable to resolve ANALOG_CFG."
+	RMAGIC_CFG=$(rmagic_cfg $WEBROOT $WEBSITE) || exit1 "Unable to resolve RMAGIC_CFG."
 	WEBALIZER_CFG=$(webalizer_cfg $WEBROOT $WEBSITE) || exit1 "Unable to resolve WEBALIZER_CFG."
 
 	HOST=$(host $WEBROOT $WEBSITE) || exit1 "Unable to get hostname for virtual host."
@@ -112,6 +115,7 @@ for WEBSITE in $WEBSITES; do
 	LOGFILESRESOLVEDGZ=$(logfilesresolvedgz $LOGROOT $WEBSITE)
 
 	ANALOG_OPTIONS="-G +g/etc/analog.conf +g$ANALOG_CFG +A -a"
+	RMAGIC_OPTIONS=""
 	WEBALIZER_OPTIONS="-c /etc/webalizer.conf -c $WEBALIZER_CFG -o $STATSDIR/webalizer -f"
 	AWSTATS_OPTIONS="-update"
 	FQDN_ESC=`echo "$HOST.$DOMAIN" | sed -e 's/\./\\\./g'` # needed for awstats config
@@ -120,11 +124,13 @@ for WEBSITE in $WEBSITES; do
 		echo "Making stats for $WEBSITE in $STATSDIR:"
 		JDRESOLVE_OPTIONS="$JDRESOLVE_OPTIONS -p"
 		ANALOG_OPTIONS="$ANALOG_OPTIONS +q"
+		RMAGIC_OPTIONS="$RMAGIC_OPTIONS"
 		WEBALIZER_OPTIONS="$WEBALIZER_OPTIONS -T"
 		AWSTATS_OPTIONS="$AWSTATS_OPTIONS -showsteps"
 	else
 		JDRESOLVE_OPTIONS="$JDRESOLVE_DB -n"
 		ANALOG_OPTIONS="$ANALOG_OPTIONS -q"
+		RMAGIC_OPTIONS="$RMAGIC_OPTIONS -statistics_Verbose=NONE"
 		WEBALIZER_OPTIONS="$WEBALIZER_OPTIONS -Q"
 		AWSTATS_OPTIONS="$AWSTATS_OPTIONS"
 	fi
@@ -159,6 +165,33 @@ LANGUAGE	DANISH
 			[ $DEBUG ] && echo "$WEBSITE: Create initial analog stats"
 			$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
+			[ $DEBUG ] && echo "$WEBSITE: Create/update Report Magic config"
+			echo "\
+# NB! This file is automatically generated. Do not edit directly!
+# Instead, put additions/overrides in $RMAGIC_CFG.local
+
+[statistics]
+File_In = $STATSDIR/rmagic/report.dat
+Frame_File_Out = $STATSDIR/rmagic/index.html
+Language = en
+
+[reports]
+File_Out = $STATSDIR/rmagic/
+
+[QUICK]
+Rows = ALL
+
+[navigation]
+File_Out = navfile.html
+"\
+			> $RMAGIC_CFG
+			[ -s $RMAGIC_CFG.local ] && $RMAGIC_OPTIONS="$RMAGIC_OPTIONS -statistics_Include=$RMAGIC_CFG.local"
+			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
+		fi
 		if [ -x $WEBALIZER_BIN ]; then
 			[ $DEBUG ] && echo "$WEBSITE: Create/update Webalizer config"
 			echo "\
@@ -229,6 +262,11 @@ ShowFlagLinks=0
 			[ $DEBUG ] && echo "$WEBSITE: Update analog stats"
 			$ANALOG_BIN $ANALOG_OPTIONS -C"LOGFILE none" -C"LOGFILE $LOGDATA" -C"CACHEFILE $STATSDIR/analog/cache.data" -C"OUTFILE $STATSDIR/analog/index.html"
 		fi
+		if [ -x $RMAGIC_BIN -a -x $ANALOG_BIN ]; then
+			[ $DEBUG ] && echo "$WEBSITE: Update Report Magic stats"
+			$ANALOG_BIN $ANALOG_OPTIONS -C"LOGFILE none" -C"LOGFILE $LOGDATA" -C"CACHEFILE $STATSDIR/analog/cache.data" -C"OUTPUT COMPUTER" -C"OUTFILE $STATSDIR/rmagic/report.dat"
+			$RMAGIC_BIN $RMAGIC_OPTIONS $RMAGIC_CFG
+		fi
 		if [ -x $WEBALIZER_BIN ]; then
 			[ $DEBUG ] && echo "$WEBSITE: Update Webalog stats"
 			zcat -f $LOGDATA | $WEBALIZER_BIN $WEBALIZER_OPTIONS -N 0 -
@@ -239,6 +277,6 @@ ShowFlagLinks=0
 			$AWSTATS_BIN -config=$WEBSITE $AWSTATS_OPTIONS -output > $STATSDIR/awstats/index.html
 			awstats_setlog /etc/awstats/awstats.$WEBSITE.conf $LOGDATATMP
 		fi
-		gzip -9 $LOGDATA
+		gzip -f9 $LOGDATA
 	fi
 done