--- report~	2007-07-23 10:35:11.000000000 -0600
+++ report	2007-07-22 18:54:43.000000000 -0600
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-PATH="/bin:/usr/bin"
+PATH="/floppy:/bin:/usr/bin"
 LOGDIR="/var/log/aide"
 LOGFILE="aide.log"
-CONFFILE="/etc/aide/aide.conf"
+CONFFILE="/floppy/aide.conf"
 ERRORLOG="error.log"
 ERRORTMP=`tempfile --directory "/tmp" --prefix "$ERRORLOG"`
 
-[ -f /usr/bin/aide ] || exit 0
+[ -f /floppy/aide ] || exit 0
 
 if [ -f /etc/default/aide ]; then
 	. /etc/default/aide
@@ -20,9 +20,9 @@
 # default values
 
 MAILTO="${MAILTO:-root}"
-DATABASE="${DATABASE:-/var/lib/aide/aide.db}"
+DATABASE="${DATABASE:-/floppy/aide.db}"
 LINES="${LINES:-1000}"
-COMMAND="${COMMAND:-check}"
+COMMAND="${COMMAND:-update}"
 
 AIDEARGS="-V4"
 
@@ -37,7 +37,7 @@
 [ -f "$LOGDIR/$LOGFILE" ] && savelog -t -g adm -m 640 -u root -c 7 "$LOGDIR/$LOGFILE" > /dev/null
 [ -f "$LOGDIR/$ERRORLOG" ] && savelog -t -g adm -m 640 -u root -c 7 "$LOGDIR/$ERRORLOG" > /dev/null
 
-aide $AIDEARGS --$COMMAND >"$LOGDIR/$LOGFILE" 2>"$ERRORTMP"
+aide $AIDEARGS --config=/floppy/aide.conf --$COMMAND >"$LOGDIR/$LOGFILE" 2>"$ERRORTMP"
 RETVAL=$?
 
 if [ -n "$QUIETREPORTS" ] && [ $QUIETREPORTS -a \! -s $LOGDIR/$LOGFILE -a \! -s $ERRORTMP ]; then
@@ -90,49 +90,6 @@
 	echo "AIDE produced no errors."
 fi
 
-# include de-noised log
-
-if [ -n "$NOISE" ]; then
-	NOISETMP=`tempfile --directory "/tmp" --prefix "aidenoise"`
-	NOISETMP2=`tempfile --directory "/tmp" --prefix "aidenoise"`
-	sed -n '1,/^Detailed information about changes:/p' "$LOGDIR/$LOGFILE" | \
-	grep '^\(changed\|removed\|added\):' | \
-	grep -v "^added: THERE WERE ALSO [0-9]\+ FILES ADDED UNDER THIS DIRECTORY" > $NOISETMP2
-	
-	if [ -n "$NOISE" ]; then
-		< $NOISETMP2 grep -v "^\(changed\|removed\|added\):$NOISE" > $NOISETMP
-		rm -f $NOISETMP2
-		echo "De-Noised output removes everything matching $NOISE."
-	else
-		mv $NOISETMP2 $NOISETMP
-		echo "No noise expression was given."
-	fi
-	
-	if [ -s "$NOISETMP" ]; then
-		loglines=`< $NOISETMP wc -l | awk '{ print $1 }'`
-		if [ ${loglines:=0} -gt $LINES ]; then
-			cat << EOF;
-
-****************************************************************************
-*   aide has returned long output which has been truncated in this mail    *
-****************************************************************************
-
-EOF
-			echo "De-Noised output is $loglines lines, truncated to $LINES."
-			< $NOISETMP head -$LINES
-			echo "The full output can be found in $LOGDIR/$LOGFILE."
-		else
-			echo "De-Noised output of the daily AIDE run ($loglines lines):"
-			cat $NOISETMP
-		fi
-	else
-		echo "AIDE detected no changes after removing noise."
-	fi
-	rm -f $NOISETMP
-	echo "============================================================================"
-fi
-
-# include non-de-noised log
 
 if [ -s "$LOGDIR/$LOGFILE" ]; then
 	loglines=`wc -l "$LOGDIR/$LOGFILE" | awk '{ print $1 }'`