From 7355535ee18efc472f5a598b8474e8d05765d6f1 Mon Sep 17 00:00:00 2001 From: Jacob Anawalt Date: Mon, 11 Oct 2010 18:53:00 -0600 Subject: Enable pg_dump format option. The format option of pg_dump enables tar and custom archive file formats in addition to the default plain-text file containing SQL commands. When either the tar or custom format are selected the behaviour of database=all is changed to no longer dump a single file via pg_dumpall. Instead pg_dumpall is called once to export the "global" data (roles & tablespaces) and then pg_dump is called once for each non-template table in the database. To support the GZIP and GZIP_OPTS variables in backupninja and to give the default --rsyncable gzip compression flag a chance at working on a PostgreSQL backup, the custom output is forced to not use compression. Instead compression is done via a pipe to gzip. Hopefully this benefits rsync and rdiff-backup style backups for reduced backup and storage costs that outweigh the restoration ones. --- examples/example.pgsql | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'examples') diff --git a/examples/example.pgsql b/examples/example.pgsql index 42f045e..5a4e02f 100644 --- a/examples/example.pgsql +++ b/examples/example.pgsql @@ -17,6 +17,19 @@ # compress = < yes | no > (default = yes) # if yes, compress the pg_dump/pg_dumpall output. +# format = < plain | tar | custom > (default = plain) +# plain - Output a plain-text SQL script file with the extension .sql. +# When dumping all databases, a single file is created via pg_dumpall. +# tar - Output a tar archive suitable for input into pg_restore. More +# flexible than plain and can be manipulated by standard Unix tools +# such as tar. Creates a globals.sql file and an archive per database. +# custom - Output a custom PostgreSQL pg_restore archive. This is the most +# flexible format allowing selective import and reordering of database +# objects at the time the database is restored via pg_restore. This +# option creates a globals.sql file containing the cluster role and +# other information dumped by pg_dumpall -g and a pg_restore file +# per selected database. See the pg_dump and pg_restore man pages. + ### You can also set the following variables in /etc/backupninja.conf: # PGSQLDUMP: pg_dump path (default: /usr/bin/pg_dump) # PGSQLDUMPALL: pg_dumpall path (default: /usr/bin/pg_dumpall) -- cgit v1.2.3 From a036144de87424ad0cab8fa8491db44af40c0e16 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Thu, 27 Jan 2011 19:02:05 +0100 Subject: Documentation: recommend using 4096 bits RSA keys everywhere. --- ChangeLog | 2 ++ README | 4 ++-- examples/example.dup | 2 +- handlers/dup.helper.in | 2 +- man/backupninja.1 | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) (limited to 'examples') diff --git a/ChangeLog b/ChangeLog index b66a589..6063fa9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,8 @@ version 0.9.9 -- UNRELEASED the patch. rdiff: . Generate 4096 bits RSA keys. + documentation changes + . Recommend using 4096 bits RSA keys everywhere. version 0.9.8.1 -- October 31, 2010 (boo!) backupninja changes diff --git a/README b/README index 8b01add..41d4186 100644 --- a/README +++ b/README @@ -201,8 +201,8 @@ In order for rdiff-backup to sync files over ssh unattended, you must create ssh keys on the source server and copy the public key to the remote user's authorized keys file. For example: - root@srchost# ssh-keygen -t dsa - root@srchost# ssh-copy-id -i /root/.ssh/id_dsa.pub backup@desthost + root@srchost# ssh-keygen -t rsa -b 4096 + root@srchost# ssh-copy-id -i /root/.ssh/id_rsa.pub backup@desthost Now, you should be able to ssh from user 'root' on srchost to user 'backup' on desthost without specifying a password. diff --git a/examples/example.dup b/examples/example.dup index 0ed5b2a..3eb4529 100644 --- a/examples/example.dup +++ b/examples/example.dup @@ -203,7 +203,7 @@ exclude = /var/cache/backupninja/duplicity ## warning: sftp does not support all scp options, especially -i; as ## a workaround, you can use "-o " ## an example setting would be: -## sshoptions = -o IdentityFile=/root/.ssh/id_dsa_duplicity +## sshoptions = -o IdentityFile=/root/.ssh/id_rsa_duplicity ## ## Default: # sshoptions = diff --git a/handlers/dup.helper.in b/handlers/dup.helper.in index 12331a3..f85cf87 100644 --- a/handlers/dup.helper.in +++ b/handlers/dup.helper.in @@ -449,7 +449,7 @@ bandwidthlimit = $dup_bandwidth # passed directly to ssh, scp (and sftp in duplicity >=0.4.2) # warning: sftp does not support all scp options, especially -i; as # a workaround, you can use "-o " -#sshoptions = -o IdentityFile=/root/.ssh/id_dsa_duplicity +#sshoptions = -o IdentityFile=/root/.ssh/id_rsa_duplicity sshoptions = $dup_sshoptions # put the backups under this destination directory diff --git a/man/backupninja.1 b/man/backupninja.1 index 5622881..4363222 100644 --- a/man/backupninja.1 +++ b/man/backupninja.1 @@ -104,7 +104,7 @@ Then, vital parts of the file system, including /var/backups, are nightly pushed .TP In order for this to work (ie for diff-backup to run unattended), you must create ssh keys on the source server and copy the public key to the remote user's authorized keys file. For example: .br -root@srchost# ssh-keygen -t dsa +root@srchost# ssh-keygen -t rsa -b 4096 .br root@srchost# ssh-copy-id -i /root/.ssh/id_dsa.pub backup@desthost .TP -- cgit v1.2.3 From 2392094a242248f702ebfcb4644f623d2d3aedde Mon Sep 17 00:00:00 2001 From: intrigeri Date: Wed, 16 Feb 2011 08:22:10 +0100 Subject: Make units clearer (Closes Redmine bug #2737). --- ChangeLog | 2 ++ examples/example.dup | 4 ++-- examples/example.rsync | 2 +- handlers/dup.helper.in | 2 +- handlers/rsync.in | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) (limited to 'examples') diff --git a/ChangeLog b/ChangeLog index 6063fa9..2a94593 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,10 +26,12 @@ version 0.9.9 -- UNRELEASED #2370). Thanks to ale for the patch. rsync: . Fix long rotation. + . Make units clearer (Closes Redmine bug #2737) helper changes dup: . Fix separate signing key usecase. Thanks to Ian Beckwith for the patch. + . Make units clearer (Closes Redmine bug #2737) rdiff: . Generate 4096 bits RSA keys. documentation changes diff --git a/examples/example.dup b/examples/example.dup index 3eb4529..cc64790 100644 --- a/examples/example.dup +++ b/examples/example.dup @@ -191,9 +191,9 @@ exclude = /var/cache/backupninja/duplicity ## Default: # ftp_password = -## bandwith limit, in kbit/s ; default is 0, i.e. no limit +## bandwith limit, in Kbit/s ; default is 0, i.e. no limit ## if using 'desturl' above, 'bandwidthlimit' must not be set -## an example setting of 128 kbps would be: +## an example setting of 128 Kbit/s would be: ## bandwidthlimit = 128 ## ## Default: diff --git a/examples/example.rsync b/examples/example.rsync index 9053f3e..3c280ba 100644 --- a/examples/example.rsync +++ b/examples/example.rsync @@ -89,7 +89,7 @@ exclude_vserver = excluded_vserver2 # if set to 1, compress data on rsync (remote source only) #compress = 0 -# set a badnwidth limit in kbps (remote source only) +# set a badnwidth limit in KB/s (remote source only) #bandwidthlimit = # remote rsync program (remote source only) diff --git a/handlers/dup.helper.in b/handlers/dup.helper.in index f85cf87..5cd9dc6 100644 --- a/handlers/dup.helper.in +++ b/handlers/dup.helper.in @@ -442,7 +442,7 @@ keep = $dup_keep # bandwith limit, in kbit/s ; default is 0, i.e. no limit # if using 'desturl' above, 'bandwidthlimit' must not be set -# an example setting of 128 kbps would be: +# an example setting of 128 Kbit/s would be: #bandwidthlimit = 128 bandwidthlimit = $dup_bandwidth diff --git a/handlers/rsync.in b/handlers/rsync.in index 7b06c24..d35445e 100644 --- a/handlers/rsync.in +++ b/handlers/rsync.in @@ -60,7 +60,7 @@ # exclude_vserver = vserver-name (valid only if vservers = yes on backupninja.conf) # numericids = when set to 1, use numeric ids instead of user/group mappings on rsync # compress = if set to 1, compress data on rsync (remote source only) -# bandwidthlimit = set a badnwidth limit in kbps (remote source only) +# bandwidthlimit = set a badnwidth limit in KB/s (remote source only) # remote_rsync = remote rsync program (remote source only) # id_file = ssh key file (remote source only) # batch = set to "yes" to rsync use a batch file as source @@ -79,7 +79,7 @@ # port = remote port number (remote destination only) # user = remote user name (remote destination only) # id_file = ssh key file (remote destination only) -# bandwidthlimit = set a badnwidth limit in kbps (remote destination only) +# bandwidthlimit = set a badnwidth limit in KB/s (remote destination only) # remote_rsync = remote rsync program (remote dest only) # batch = set to "yes" to rsync write a batch file from the changes # batchbase = folder where the batch file should be written -- cgit v1.2.3 From 3e60fd37de03d211bd6553991df4f6929526841a Mon Sep 17 00:00:00 2001 From: Olivier Berger Date: Mon, 25 Apr 2011 22:49:57 +0200 Subject: Adding new option --- examples/example.dup | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'examples') diff --git a/examples/example.dup b/examples/example.dup index cc64790..5e6b424 100644 --- a/examples/example.dup +++ b/examples/example.dup @@ -164,6 +164,14 @@ exclude = /var/cache/backupninja/duplicity ## Default: # keep = 60 +# for how many full backups do we keep their later increments ; +# default is all (keep all increments). +# increments for older full backups will be deleted : only the more +# recent ones (count provided) will be kept +# +## Default: +# keepincroffulls = all + ## full destination URL, in duplicity format; if set, desturl overrides ## sshoptions, destdir, desthost and destuser; it also disables testconnect and ## bandwithlimit. For details, see duplicity manpage, section "URL FORMAT", some -- cgit v1.2.3 From ee587946a67c6b52f5a8ce6ceb565d57e593e0d6 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 26 Apr 2011 12:31:58 +0200 Subject: Add sshoptions to rdiff example config file. --- examples/example.rdiff | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/example.rdiff b/examples/example.rdiff index 5adecd8..e8ce542 100644 --- a/examples/example.rdiff +++ b/examples/example.rdiff @@ -161,4 +161,9 @@ exclude = /var/cache/backupninja/duplicity ## Default: # user = - +## passed directly to ssh +## an example setting would be: +## sshoptions = -o IdentityFile=/root/.ssh/id_rsa_duplicity +## +## Default: +# sshoptions = -- cgit v1.2.3