Improved ModLogAn config and invocation.

1 files changed, 40 insertions, 13 deletions

diff --git a/localwebstats b/localwebstats
index 36a27cf..6dbc477 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.24 2002-12-28 16:23:06 jonas Exp $
+# $Id: localwebstats,v 1.25 2003-05-22 12:32:06 jonas Exp $
 #
 # Webstats maintenance script
 #
@@ -103,7 +103,7 @@ function rmagic_cfg()		{ echo /etc/rmagic/rmagic_$3.conf; }
 function webalizer_cfg()	{ echo /etc/webalizer_$3.conf; }
 function modlogan_cfg()		{ echo /etc/modlogan/modlogan_$3.conf; }
 function pre_init()		{ true; }
-function post_init()		{ true; }
+function post_init()		{ [ -f /var/www/VIRTUAL/stats.jones.dk/www/COMMON/index.html ] && cp /var/www/VIRTUAL/stats.jones.dk/www/COMMON/index.html `statsdir $1 $2 $3`/; }
 function pre_update()		{ true; }
 function post_update()		{ true; }
 
@@ -166,6 +166,7 @@ for WEBSITE in $WEBSITES; do
 	RMAGIC_OPTIONS=""
 	WEBALIZER_OPTIONS="-c /etc/webalizer.conf -c $WEBALIZER_CFG -o $STATSDIR/webalizer -f"
 	MODLOGAN_OPTIONS="-c $MODLOGAN_CFG"
+	MODLOGAN_TAIL="2>&1 | egrep -v '^(modlogan [\.0-9]+|main\.c\.658 \(main\): startup - finished| *(\[\.* *[0-9]*\])?|.+: No such file or directory, first run \?)$' || true if [ $? \< 2 ]"
 	AWSTATS_OPTIONS="-update"
 	FQDN_ESC=`echo "$HOST.$DOMAIN" | sed -e 's/\./\\\./g'` # needed for awstats config
 
@@ -176,6 +177,7 @@ for WEBSITE in $WEBSITES; do
 		RMAGIC_OPTIONS="$RMAGIC_OPTIONS"
 		WEBALIZER_OPTIONS="$WEBALIZER_OPTIONS -T"
 		MODLOGAN_OPTIONS="$MODLOGAN_OPTIONS"
+		MODLOGAN_TAIL=""
 		AWSTATS_OPTIONS="$AWSTATS_OPTIONS -showsteps"
 	else
 		JDRESOLVE_OPTIONS="$JDRESOLVE_DB -n"
@@ -183,6 +185,7 @@ for WEBSITE in $WEBSITES; do
 		RMAGIC_OPTIONS="$RMAGIC_OPTIONS -statistics_Verbose=NONE"
 		WEBALIZER_OPTIONS="$WEBALIZER_OPTIONS -Q"
 		MODLOGAN_OPTIONS="$MODLOGAN_OPTIONS"
+		MODLOGAN_TAIL="$MODLOGAN_TAIL"
 		AWSTATS_OPTIONS="$AWSTATS_OPTIONS"
 	fi
 
@@ -272,8 +275,9 @@ includepath = /etc/modlogan
 include = modlogan.def.conf,global
 
 loadplugin = input_clf
-loadplugin = output_modlogan
 loadplugin = processor_web
+loadplugin = output_modlogan
+loadplugin = output_template
 
 statedir=$STATSDIR/modlogan
 
@@ -281,20 +285,41 @@ incremental = 0
 debug_level = 0
 enable_resolver = 0
 
+#read_ahead_limit = 1
+
+var(outputdir, \$statedir)
+
 [processor_web]
 include = group.url.conf,group_exploits
 include = modlogan.def.conf,processor_web
 
 debug_searchengines = 0
+debug_visits = 0
 
-hidereferrer = \"^http://$HOST\.${DOMAIN//./\.}\"
+hidereferrer = \"\.${DOMAIN//./\.}/\"
 
 [output_modlogan]
-include = modlogan.def.conf,output_modlogan
+include = modlogan.def.conf, output_modlogan
+
+hostname = $HOST.$DOMAIN
+
+outputdir=\$outputdir
+
+[output_template]
+include = modlogan.def.conf, output_template
+include = modlogan.def.conf, output_template_reports_web
+include = modlogan.def.conf, output_template_menu_web
+
+template_path = /usr/local/share/modlogan/themes/
+template_name = basic
+
+variable = HOSTNAME,$HOST.$DOMAIN
+variable = CHARSET,iso-8859-1
+variable = LANGUAGE,da
 
-hostname = http://$HOST.$DOMAIN
+hostname = $HOST.$DOMAIN
 
-outputdir=$STATSDIR/modlogan
+outputdir=\$outputdir-test
 
 [input_clf]
 include = modlogan.def.conf,input_clf
@@ -302,13 +327,15 @@ inputfile = -
 "\
 			> $MODLOGAN_CFG
 			[ -s $MODLOGAN_CFG.local ] && cat $MODLOGAN_CFG.local >> $MODLOGAN_CFG
-			[ -d $STATSDIR/modlogan ] || mkdir $STATSDIR/modlogan
-			[ $ROOT ] && chown $user:$group $STATSDIR/modlogan
+			for dir in $STATSDIR/modlogan $STATSDIR/modlogan-test; do
+				[ -d $dir ] || mkdir $dir
+				[ $ROOT ] && chown $user:$group $dir
+			done
 			[ $DEBUG ] && echo "$WEBSITE: Create initial ModLogAn stats"
 			if [ $ROOT ]; then
-				cat $LOGDATARESOLVED | su $user -c "$MODLOGAN_BIN $MODLOGAN_OPTIONS" || true
+				cat $LOGDATARESOLVED | su $user -c "$MODLOGAN_BIN $MODLOGAN_OPTIONS $MODLOGAN_TAIL"
 			else
-				cat $LOGDATARESOLVED | $MODLOGAN_BIN $MODLOGAN_OPTIONS || true
+				cat $LOGDATARESOLVED | $MODLOGAN_BIN $MODLOGAN_OPTIONS $MODLOGAN_TAIL
 			fi
 		fi
 		if [ -x $AWSTATS_BIN ]; then
@@ -376,9 +403,9 @@ ShowFlagLinks=0
 		if [ -x $MODLOGAN_BIN ]; then
 			[ $DEBUG ] && echo "$WEBSITE: Update ModLogAn stats"
 			if [ $ROOT ]; then
-				cat $LOGDATA | su $user -c "$MODLOGAN_BIN $MODLOGAN_OPTIONS" >/dev/null
+				cat $LOGDATA | su $user -c "$MODLOGAN_BIN $MODLOGAN_OPTIONS $MODLOGAN_TAIL"
 			else
-				cat $LOGDATA | $MODLOGAN_BIN $MODLOGAN_OPTIONS >/dev/null
+				cat $LOGDATA | $MODLOGAN_BIN $MODLOGAN_OPTIONS $MODLOGAN_TAIL
 			fi
 		fi
 		if [ -x $AWSTATS_BIN ]; then