Improve run-time configuration framework; provide boilerplate for the backup subcommand

1 files changed, 40 insertions, 110 deletions

diff --git a/beam.conf b/beam.conf
index f0c595a..c2587ff 100644
--- a/beam.conf
+++ b/beam.conf
@@ -1,114 +1,44 @@
-##########################################################################
-# Hooks
-##########################################################################
-#
-# Special variables, called hooks, allow you to supply arbitrary
-# procedures to be run before and after backup.
-# 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.
-[hook openlog]
-	command = beam_logrotate
-	
-# The prologue_hook is a list of commands to run before starting backup
-# (or restore).
-[hook prologue]	
-	command =
-# The epilogue_hook is a list of commands to run when the backup
-# (or restore) finishes.
-[hook epilogue]
-	command =
-	
-[core]
-	# Interval in weeks during which old backups and snapshots are
-	# retained.
-	# If zero or empty, backups are retained forever.
-	retain-interval =
+[core]	
+	# Location of the state file
+	statfile = /var/spool/beam/beam.state
 	# Directory for temporary files
 	tempdir = /tmp
-	# Set to On, if you wish backup procedures to be verbose.
-	verbose = On
-	# List of items to backup
-	items = dbdump system
-	
-[tar]
-	# Thes variables configure invocation of tar.
-
-	# Any additional options to pass to tar. Do not place tar operation
-	# switches (as -c, -t, etc.) here! These will be added automatically
-	# by appropriate scripts, depending on the operation being performed.
-	#
-	# By default this variable is empty (no additional options).
-	#
-	options = -j
-
-	# Suffix for archive files.
-	# Default is "tar"
-	#
-	suffix = tar.bz2
-
-	# Directory where archive files are to be located. It's OK to specify
-	# a remote directory here, e.g. 10.10.0.1:/export/backup
-	#
-	# This variable must be set. Whatever directory it points to must
-	# already exist, the backup script won't create it.
-	archive-dir = /var/backups
-
-	# Directory where to store snapshot files. The files will be named as
-	# their archive counterparts, with the suffix ".db".
-	#
-	# This variable must be set
-	snapshot-dir = /var/lib/backups
-
-[item dbdump]
-	type = postgres
-	database = mydb
-
-[item system]
-	type = fs
-        directory = /
-	files = etc var/spool
-
-[report]
-	# Comma-separated list of emails to send backup reports to.  If emply,
-	# mail notifications are not sent.
-	email =
-
-	# Sender email address.  Backup reports will appear to be sent from
-	# this address.  The default value is root@$(hostname).
-	# If set, this variable must contain a single email address, without
-	# personal part or comments, e.g.
-	sender =
-
-	# You can supply personal part of the sender email using this variable.
-	# The personal part will be enclosed in double quotes and prepended to
-	# the value of $backup_sender_email to form a valid RFC-2822 "From"
-	# header.
-	# For example, if you have:
-	#   sender = root@example.com
-	#   sender-personal = Automatic backup report
-	# you will see the following in the report headers:
-	#  From: "Automatic backup report" <root@example.com>
-	sender-personal =
-
-	# Supply additional header for the report message.  By default,
-	# the following headers are generated:
-	#  From, To, Subject, X-Beam-Items, X-Beam-Round and X-Beam-Level.
-	# The three X- headers contain the backed up items (as set in the
-	# backup_items variable), backup round and backup level numbers,
-	# correspondingly.
-	#
-	# Multiple headers statements are OK
-	header = X-My-Info: ok
-
-	# Any text to be output before the actual report.
-	intro =
-
-	# Text to be added at the end of the report.
-	signature =
 
+# Configure logging
+[logger]
+	# Declare the channel.  Valid values are: "file" and "syslog"
+	channel = file
+	# Debug verbosity level
+	debug = 0
+
+# This section is inspected if logger.channel=syslog
+[logger syslog]
+	# Syslog facility to use	
+	facility = user
+	# Syslog tag (default - base name of the program)
+	tag = beam
+	# Syslog options (a comma-separated list).  Valid options are:
+	# ndelay, noeol, nofatal, nonul, nowait, perror, and pid.
+	options = pid
+	
+# This section is inspected if logger.channel=file
+[logger file]
+	# Name of the log file.  Unless set, STDERR is used.
+	#name = /var/log/backup.log
+
+	# Append to the file, if it exists
+	append = On
+	# Print timestamp.  Valid values (case-insensitive):
+	#  on, yes, true, t, 1  - to enable
+	#  off, no, false, f, nil, 0 - to disable
+	timestamp = On
+
+# Configures backup schedule	
+[schedule]
+	# Do this number of incremental backups in each round	
+	levels = 2
+	# Do this number of rounds before starting next full backup
+	rounds = 3
+	# Retain this number of completed rounds.
+	retain = 8