Minor changes.

* beam.conf (backup_logrotate_conf): Initialize variable.
* cleaner.in: Include more detail in the initial verbose header.
* lib/beam/common.in (beam_logrotate): Pass $verbose to logrotate.

3 files changed, 13 insertions, 5 deletions

diff --git a/beam.conf b/beam.conf
index 244ada7..ce16b50 100644
--- a/beam.conf
+++ b/beam.conf
@@ -15,14 +15,22 @@ echo >&2 "$0: WARNING: using default configuration boilerplate"
 #
 # Special variables, called hooks, allow you to supply arbitrary
 # procedures to be run before and after backup.
-# When set, both variables must contain a whitespace-separated list of
-# commands to be invoked.  These commands will be invoked without arguments
-# and run in order of their appearance in the list.
+# When set, a hook must contain a whitespace-separated list of commands to
+# be invoked.  These commands will be invoked without arguments and in
+# order of their appearance in the list.
 
 # Commands listed in openlog_hook are run before opening the logfile.  The
 # most common use for this hook is to rotate an oversized logfile prior to
 # opening it.
+#
+# Beam's default hook is beam_logrotate, which uses logrotate(8) to manage
+# the log file.
 openlog_hook=beam_logrotate
+# Additional configuration for logrotate can be supplied in the
+# backup_logrotate_conf variable.
+backup_logrotate_conf="weekly
+rotate 4
+"
 # The prologue_hook is a list of commands to run before starting backup
 # (or restore).  
 prologue_hook=
diff --git a/cleaner.in b/cleaner.in
index c89511f..d8a57bc 100755
--- a/cleaner.in
+++ b/cleaner.in
@@ -55,7 +55,7 @@ esac
 thisweek=$(date +%U)
 lastweek=$((thisweek - retainweeks))
 
-$verbose \# removing files older than week $lastweek 
+$verbose \# removing from $dir files ending in $suffix and older than week $lastweek
 
 if [ -z "$suffix" ]; then
   find $dir -type f -printf '%f\n' 
diff --git a/lib/beam/common.in b/lib/beam/common.in
index e5ad7a6..cdb6e7c 100644
--- a/lib/beam/common.in
+++ b/lib/beam/common.in
@@ -202,6 +202,6 @@ $backup_logrotate_conf
 EOF
   umask $u
   test -d @LOCALSTATEDIR@/lib/beam || mkdir @LOCALSTATEDIR@/lib/beam
-  logrotate ${dry_run+-d} --state @LOCALSTATEDIR@/lib/beam/logrotate.state $conf
+  logrotate ${dry_run+-d} $verbose --state @LOCALSTATEDIR@/lib/beam/logrotate.state $conf
   rm $conf
 }