diff --git a/AUTHORS b/AUTHORS index 129ebdd..c3d48b6 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,6 @@ BACKUPNINJA was written by the Riseup Collective: intellectual property is theft. -Ninjas: +Ninjas: elijah@riseup.net -- original code, bug fixes, man pages micah@riseup.net -- debian package, vserver support, bug fixes @@ -12,7 +12,7 @@ paulv@bikkel.org -- rsnap handler Robert Napier -- improved RPM build rhatto -- rub handler and patches -Patches: +Patches: cmccallum@thecsl.org Daniel.Bonniot@inria.fr -- mysql ignores and nodata diff --git a/ChangeLog b/ChangeLog index 8804cac..3adc1dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,7 +27,7 @@ version 1.1.0 -- June 29, 2018 · Avoid looking for partitions on zram devices Thanks to Glandos for the patch · Support extracting LUKS headers from partitions - Thanks to Lyz for the patch. + Thanks to Lyz for the patch. version 1.0.2 -- September 05, 2017 handler changes diff --git a/NEWS b/NEWS index 9867b54..ed499b2 100644 --- a/NEWS +++ b/NEWS @@ -39,7 +39,7 @@ backupninja (0.9.4-1) UNRELEASED situations, with weird behavious, due to incompatibilities between various readlink versions in this field. This has been made clear eventually: globbing is fully supported again, whereas no - attempt is done to dereference symlinks anymore. + attempt is done to dereference symlinks anymore. Please read the new /usr/share/doc/backupninja/examples/example.dup or /usr/share/doc/backupninja/examples/example.rdiff file, and update your own configuration files if needed. @@ -51,7 +51,7 @@ backupninja (0.9.4-1) UNRELEASED sshoptions = -i /root/.ssh/id_dsa_duplicity with: sshoptions = -o IdentityFile=/root/.ssh/id_dsa_duplicity - + backupninja (0.9.2-1) unstable; urgency=low WARNING FOR DUPLICITY USERS diff --git a/README.md b/README.md index 23a7845..4de6ae8 100644 --- a/README.md +++ b/README.md @@ -135,11 +135,11 @@ Unless otherwise specified, the config file format is "ini style." For example: # this is a comment - + [fishes] fish = red fish = blue - + [fruit] apple = yes pear = no thanks \ diff --git a/etc/backupninja.conf.in b/etc/backupninja.conf.in index 7625a27..a350fc8 100644 --- a/etc/backupninja.conf.in +++ b/etc/backupninja.conf.in @@ -21,7 +21,7 @@ reportemail = root # even if all modules reported success. (default = yes) reportsuccess = yes -# if set to 'yes', info messages from handlers will be +# if set to 'yes', info messages from handlers will be # sent into the email (default = no) reportinfo = no @@ -35,18 +35,18 @@ reportspace = no # where to rsync the backupninja.log to be aggregated in # a ninjareport -reporthost = +reporthost = # what user to connect to reporthost to sync the # backupninja.log reportuser = ninja # where on the reporthost should the report go -# NOTE: the name of the log will be used in the report, +# NOTE: the name of the log will be used in the report, # use a globally unique name, preferably the hostname reportdirectory = /var/lib/backupninja/reports -# set to the administration group that is allowed to +# set to the administration group that is allowed to # read/write configuration files in /etc/backup.d admingroup = root diff --git a/handlers/Makefile.am b/handlers/Makefile.am index e952645..43ba5d1 100644 --- a/handlers/Makefile.am +++ b/handlers/Makefile.am @@ -14,7 +14,7 @@ EXTRA_DIST = Makefile.am $(DIST_HANDLERS) edit = sed \ -e "s,@BASH\@,$(BASH),g" \ -e "s,@AWK\@,$(AWK),g" \ - -e "s,@SED\@,$(SED),g" + -e "s,@SED\@,$(SED),g" pkgdata_DATA = $(HANDLERS) @@ -79,7 +79,7 @@ rdiff.helper: $(srcdir)/rdiff.helper.in $(edit) $(srcdir)/rdiff.helper.in > rdiff.helper rsync: $(srcdir)/rsync.in - rm -f rsync + rm -f rsync $(edit) $(srcdir)/rsync.in > rsync sh: $(srcdir)/sh.in diff --git a/man/backup.d.5 b/man/backup.d.5 index 5b7a626..b2e66a2 100644 --- a/man/backup.d.5 +++ b/man/backup.d.5 @@ -3,7 +3,7 @@ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) .TH BACKUP.D 5 "October 10, 2005" "riseup" "backupninja package" -.SH NAME +.SH NAME BACKUP.D \- Action configuration files for \fBbackupninja(1)\fP. .\" Please adjust this date whenever revising the manpage. @@ -51,9 +51,9 @@ backup action for safe backups of trac repositories. backup action for burning backups to CD/DVD or creating ISOs. .TP -These files must be owned by root and must not be world or group readable/writable. Support for additional configuration types can be added by dropping bash scripts with the name of the suffix into /usr/share/backupninja. +These files must be owned by root and must not be world or group readable/writable. Support for additional configuration types can be added by dropping bash scripts with the name of the suffix into /usr/share/backupninja. .TP -The configuration files are processed in alphabetical order. However, it is suggested that you name the config files in "sysvinit style." +The configuration files are processed in alphabetical order. However, it is suggested that you name the config files in "sysvinit style." .TP For example: 10-local.pgsql.disabled @@ -83,7 +83,7 @@ These values for "when" are invalid: when = tuesday at 2 when = tues at 02 -A configuration file will be processed at the time(s) specified by the "when" option. If multiple "when" options are present, then they all apply. If two configurations files are scheduled to run in the same hour, then we fall back on the alphabetical ordering specified above. The "when" must occur before any sections in the action configuration file. +A configuration file will be processed at the time(s) specified by the "when" option. If multiple "when" options are present, then they all apply. If two configurations files are scheduled to run in the same hour, then we fall back on the alphabetical ordering specified above. The "when" must occur before any sections in the action configuration file. .SH FILE FORMAT @@ -99,9 +99,9 @@ The file format of the action configuration files is "ini style." Sections are c i will not have a pear. .SH SEE ALSO -.BR backupninja (1), -.BR ninjahelper (1), -.BR backupninja.conf (5), +.BR backupninja (1), +.BR ninjahelper (1), +.BR backupninja.conf (5), .br .SH AUTHOR BACKUPNINJA was written by the riseup.net collective. diff --git a/man/backupninja.1 b/man/backupninja.1 index e428fc6..e834c0f 100644 --- a/man/backupninja.1 +++ b/man/backupninja.1 @@ -24,7 +24,7 @@ BACKUPNINJA \- A lightweight, extensible meta-backup system .B "backupninja [ \-h ] [ \-v ] [ \-d ] [ \-n ] [ \-t ] [ \-f filename ] [ \-\-run filename ]" .br .SH DESCRIPTION -.B Backupninja +.B Backupninja allows you to coordinate system backups by dropping a few simple configuration files into /etc/backup.d/. Most programs you might use for making backups don't have their own configuration file @@ -58,30 +58,30 @@ encrypted remote backups (via duplicity). .IP - safe backup of MySQL, PostgreSQL, OpenLDAP, and subversion databases. .IP - -burn CD/DVDs or create ISOs. - +burn CD/DVDs or create ISOs. + .\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invoke bold face and italics, +.\" \fI\fP escape sequences to invoke bold face and italics, .\" respectively. .SH OPTIONS .TP -.B \-h, \-\-help +.B \-h, \-\-help Show summary of options .TP -.B \-V, \-\-version +.B \-V, \-\-version Show backupninja version number .TP -.B \-d, \-\-debug +.B \-d, \-\-debug Run in debug mode, where all log messages are output to the current shell. .TP -.B \-f, \-\-conffile CONF_FILE +.B \-f, \-\-conffile CONF_FILE Use CONF_FILE for the main configuration instead of /etc/backupninja.conf .TP -.B \-t, \-\-test +.B \-t, \-\-test Run in test mode, no actions are actually taken. .TP -.B \-n, \-\-now +.B \-n, \-\-now Perform actions now, instead of when they might be scheduled. .TP .B \-\-run ACTION_FILE @@ -130,9 +130,9 @@ Now, you should be able to ssh from user 'root' on srchost to user 'backup' on d .PD .SH SEE ALSO -.BR ninjahelper (1), -.BR backupninja.conf (5), -.BR backup.d (5), +.BR ninjahelper (1), +.BR backupninja.conf (5), +.BR backup.d (5), .br .SH AUTHOR BACKUPNINJA was written by the riseup.net collective. diff --git a/man/backupninja.conf.5 b/man/backupninja.conf.5 index 35ae584..72de35a 100644 --- a/man/backupninja.conf.5 +++ b/man/backupninja.conf.5 @@ -3,7 +3,7 @@ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) .TH BACKUPNINJA.CONF 5 "November 19, 2005" "riseup" "backupninja package" -.SH NAME +.SH NAME BACKUPNINJA.CONF \- Configuration file(s) for \fBbackupninja (1)\fP. .\" Please adjust this date whenever revising the manpage. @@ -30,7 +30,7 @@ is the general configuration file. In this file you can set the log level and ch .TP .B loglevel -How verbose to make the logs. +How verbose to make the logs. .br 5 = Debugging messages .br @@ -40,7 +40,7 @@ How verbose to make the logs. .br 2 = Errors .br -1 = Fatal errors +1 = Fatal errors .TP .B reportemail @@ -62,8 +62,8 @@ The path of the logfile. .B configdirectory The directory where all the backup action configuration files live. -.TP -.B scriptdirectory +.TP +.B scriptdirectory Where backupninja handler scripts are found .TP @@ -91,7 +91,7 @@ These values for 'when' are equivalent: when = TUESDAYS at 05 These values for 'when' are invalid: - + when = tuesday at 2am when = tuesday at 2 when = tues at 02 @@ -113,14 +113,14 @@ configdirectory = /etc/backup.d .br scriptdirectory = /usr/share/backupninja .br -usecolors = yes +usecolors = yes .br when = everyday at 01:00 .SH SEE ALSO -.BR backupninja (1), -.BR ninjahelper (1), -.BR backup.d (5), +.BR backupninja (1), +.BR ninjahelper (1), +.BR backup.d (5), .br .SH AUTHOR BACKUPNINJA was written by the riseup.net collective. diff --git a/man/ninjahelper.1 b/man/ninjahelper.1 index a6e319f..41f70cc 100644 --- a/man/ninjahelper.1 +++ b/man/ninjahelper.1 @@ -25,7 +25,7 @@ backupninja configuration. .SH DESCRIPTION .B Ninjahelper is an helper script to walk you through configuration of the backup -tasks for backupninja. It is a curses based "wizard" with an intuitive +tasks for backupninja. It is a curses based "wizard" with an intuitive menu-driven interface. .PP .SH ADDING NEW HELPERS @@ -38,7 +38,7 @@ handler "blue", create the file /usr/share/backupninja/blue.helper. .IP (2) next, add your helper to the global HELPERS variable and define the main function for your helper (the function name is always _wizard). To -use the blue.helper as an example: +use the blue.helper as an example: HELPERS="$HELPERS blue:description_of_this_helper" blue_wizard() { ... do work here ... @@ -53,9 +53,9 @@ would think, try to make your helper as simple as possible. Walk like a cat, become your shadow, don't let your senses betray you. .SH SEE ALSO -.BR backupninja (1), -.BR backupninja.conf (5), -.BR backup.d (5), +.BR backupninja (1), +.BR backupninja.conf (5), +.BR backup.d (5), .br .SH AUTHOR BACKUPNINJA was written by the riseup.net collective.