Commit Graph

850 Commits

Author SHA1 Message Date
lavamind
fb3b45343b Merge branch 'patch-1' into 'master'
Exclude zram devices, they don't have a partition table

See merge request riseuplabs/backupninja!12
2018-06-27 17:31:56 -07:00
lavamind
497ff73b65 Merge branch 'fix_11285' into 'master'
Attempt to sanitize the database identifiers, fix #11285

Closes #11285

See merge request riseuplabs/backupninja!11
2018-06-27 17:31:13 -07:00
lavamind
177b4267e9 Merge branch 'borg_support' into 'master'
Borg support (rebased)

See merge request riseuplabs/backupninja!10
2018-06-27 17:30:54 -07:00
Jerome Charaoui
0d9b10890e [borg] use alternative repo ssh location syntax
This adds the ability to specify an alternative SSH port within
the host variable.
2018-06-06 22:03:24 -04:00
Jerome Charaoui
1efa23869c [borg] improve comments in example.borg 2018-06-06 22:03:19 -04:00
Jerome Charaoui
9c3dffa2cd [borg] "repofile" is not a valid encryption mode 2018-06-06 22:03:12 -04:00
Glandos
90d0b9ff63 Exclude zram devices, they don't have a partition table 2018-03-24 06:23:26 -07:00
Jerome Charaoui
bc9be0d576 Attempt to sanitize the database identifiers
Removing the quote and semicolon characters should be sufficient to
prevent breaking out of the shell command, but this may need reviewed
by someone more knowlegeable in shell scripting.
2018-03-16 16:52:39 -04:00
Jerome Charaoui
0132b2453a [borg] scrap exclude*, add create_options
This allows the handler to fully make use of the advanced command-line
options for "borg create", such as the replaced "exclude*" options and
others like "--read-special" and "--numeric-owner".
2018-01-26 11:47:47 -05:00
Jerome Charaoui
e114ff68f4 [borg] remove unnecessary test on $keep 2018-01-26 11:37:04 -05:00
Jerome Charaoui
e9824c0d7d [borg] enable BORG_UNKNOWN_UNENCRYPTED_REPO_ACCESS_IS_OK
Otherwise the handler may hang, waiting for user input. This may occur
when the borg cache is deleted, or when borg is upgraded.
2018-01-26 11:32:04 -05:00
Jerome Charaoui
f43c85662d [borg] replace "keep*" options with simpler "keep"
The effect of "keep*" options is not straightforward to understand, so
replacing it with a simpler "keep" option, which replicates the
functionality of other backupninja handlers. This also simplifies the
helper, as the use is then only asked how many days of backups to keep.

At the same time, we add "prune_options" which allows for the use of the
"keep*" options as well as other useful prune options, like "--prefix".
2018-01-26 11:26:37 -05:00
Jerome Charaoui
fc0e0849dc [borg] add init option to allow skipping init command
In some cases it may be desirable to skip repository initialization, for
example when the repository is located at the root of a mount point.
2018-01-26 09:53:54 -05:00
Jerome Charaoui
714c0307c6 [borg] update AUTHORS and manpage 2018-01-26 09:44:22 -05:00
Jerome Charaoui
a95457346e [borg] fix whitespace issue 2018-01-26 09:43:58 -05:00
Jerome Charaoui
6a3a8321f0 [borg] build/debug prunestr only if prune = yes 2018-01-26 09:43:58 -05:00
Jerome Charaoui
54cc8c6b32 [borg] support for --exclude-caches and --exclude-nodump 2018-01-26 09:43:58 -05:00
Jerome Charaoui
fcdbaa3447 [borg] add bwlimit config (sets --remote-ratelimit) 2018-01-26 09:43:58 -05:00
Jerome Charaoui
c9b72249ae [borg] make help references consistent in example 2018-01-26 09:43:58 -05:00
Jerome Charaoui
87ea9c3dad [borg] update compression info in example 2018-01-26 09:43:58 -05:00
Jerome Charaoui
910676f3ea [borg] sync example default for archive 2018-01-26 09:43:58 -05:00
Jerome Charaoui
05f170760a [borg] next helper step should be selected in menu 2018-01-26 09:43:58 -05:00
Jerome Charaoui
830a00759f [borg] add 'prune' setting to allow disabling pruning 2018-01-26 09:43:58 -05:00
Jerome Charaoui
60601b2f4c [borg] consistent default in helper encryption section 2018-01-26 09:43:58 -05:00
Jerome Charaoui
a02a598bb5 [borg] change archive name to match borg default
Archive names must be unique, so if the backup runs more than once per
day with the previous default, it will throw and error because of the
duplicate archive name. This is also consistent with the addition of
the keephourly prune option.
2018-01-26 09:43:58 -05:00
Jerome Charaoui
245454b7dd [borg] fix default handler value for encryption 2018-01-26 09:43:58 -05:00
Jerome Charaoui
ce01329f01 [borg] fix final step completion check 2018-01-26 09:43:58 -05:00
Jerome Charaoui
0249e22598 [borg] Add return code to error message 2018-01-26 09:43:58 -05:00
Jerome Charaoui
61e1b31b72 [borg] fix ssh-copy-id when both keytypes exist 2018-01-26 09:43:58 -05:00
Jerome Charaoui
bb3cc0fc34 [borg] remove unnecessary proxy variable 2018-01-26 09:43:58 -05:00
Jerome Charaoui
bd4c3be7ae [borg] make indentation consistent with rest of file 2018-01-26 09:43:58 -05:00
Jerome Charaoui
7b2917bbec [borg] Rewrite include/exclude notes to match docs 2018-01-26 09:43:58 -05:00
Jerome Charaoui
fa834367c0 [borg] Fix default value for testconnect in example config 2018-01-26 09:43:58 -05:00
Jerome Charaoui
9252954538 [borg] put changelog entry in unreleased section 2018-01-26 09:43:58 -05:00
Jerome Charaoui
fed1d85bdc [borg] fix helper when setting up without encryption 2018-01-26 09:43:58 -05:00
Jerome Charaoui
88adbaa990 [borg] support keephourly option 2018-01-26 09:43:58 -05:00
Ben
fdd0280a00 [borg] fixed include order in example file 2018-01-26 09:43:58 -05:00
Ben
70873857b7 [borg] fixed connection testing (thanks @orel) 2018-01-26 09:43:58 -05:00
Thomas Preissler
d1058620e9 [borg] add example.borg to Makefile 2018-01-26 09:43:58 -05:00
Ben
02d595baab [borg] added encryption support (credit to @mxroo and @leoberry) 2018-01-26 09:43:58 -05:00
Ben
23d8c68bf8 [borg] added copyright notices 2018-01-26 09:43:58 -05:00
Ben
b4b2e0b080 [borg] updated README to include borg 2018-01-26 09:43:58 -05:00
Ben
5bd311cb6d [borg] add borg handler build files to .gitignore 2018-01-26 09:43:58 -05:00
Ben
028c9698c7 [borg] update recommendations in INSTALL.md 2018-01-26 09:43:58 -05:00
Ben
95e43d5554 [borg] update handlers/Makefile.am 2018-01-26 09:43:58 -05:00
Ben
c4e9125a71 [borg] added a borg helper 2018-01-26 09:43:58 -05:00
Ben
02b6d883aa [borg] fixed pruning in test mode, don't actually run anything 2018-01-26 09:43:58 -05:00
Ben
15cea5add5 [borg] update ChangeLog 2018-01-26 09:43:58 -05:00
Ben
ca8d479270 [borg] remove handlers/borg 2018-01-26 09:43:58 -05:00
Ben
060de6853a [borg] added support for local backups, without ssh (host=localhost) 2018-01-26 09:43:58 -05:00