Commit Graph

497 Commits

Author SHA1 Message Date
Emil Breiner
582024f4bf Quoting test of $create_options in borg handler
The check for the string length in the condition for appending the $create_options fails because it isn't a string. Fixed with quoting the variable.

Change-Id: I6bdacb81f25cf924dc61e3aa6f4b8ebfbe09da65
Signed-Off-By: Emil Breiner <emil.breiner@krumedia.com>
2020-09-08 12:13:23 +02:00
Matthias Blümel
ab8d5a3a39 Merge branch 'fix_11272' into 'master'
Fix ninjahelper bug in the mysql helper

Closes #11272

See merge request riseuplabs/backupninja!23
2020-09-01 09:20:15 -07:00
Guillaume Subiron
10b8887b8e Merge branch 'borg_cache_dir_location' into 'master'
Borg cache dir location

See merge request riseuplabs/backupninja!29
2020-08-14 05:46:34 -07:00
LeLutin
e28da8c390 borg: add configuration to displace the cache directory
borg will by default create its cache directory in ~/.cache/borg. This
means that during backup runs, borg will read and write quite
extensively from/to this directory.

In some situations, it is rather undesirable to have this amount of IO
activity in this location and it would make sense to tell borg to place
its cache elsewhere. This can help for example with placing the cache on
a hard drive where the added IO load will not have as big of an impact
on other running activity for the system.

This change also makes sure that the cache directory environment
variable is cleared out when the configuration option is unset. This
should avoid unpleasant surprises when this environment variable is set
to some unknown value in the context where backupninja is called, which
could lead to borg reading and writing to random places on the system.
2020-08-14 05:46:34 -07:00
Guillaume Subiron
edcdf9dc52 Merge branch 'borg-port' into 'master'
handlers/borg: add port support

Closes #11296

See merge request riseuplabs/backupninja!31
2020-08-14 05:32:03 -07:00
tiredpixel
3d7494bfc2 handlers/borg: add port support
This enables the handlers to be used for hosts which use a non-standard
port, such as is offered by some commercial services. Default to port
22, so it's optional and backwards-compatible.
2020-07-16 08:38:46 +00:00
Julien Rabier
ac40f35542 Update sys.in to add missing "disk" flag.
It seems like only the short output of hwinfo --disk is provided to hardware.txt. I'd suggest we also add disk to the flags for the "complete" output.
That's especially useful when you need to indicate the serial number of a dead drive in order for it to be replaced. Once the disk is dead, using hardware.txt can be the only way to retrieve this info.
2019-02-04 09:12:12 -08:00
Aurélien Olivier
82c25f4fee Remove double quotes when parsing $result 2018-11-17 11:03:30 +01:00
Aurélien Olivier
e3c1a7a5e9 checkBox function: use on/off instead of yes/no
This function uses on/off to define default values.
2018-11-17 10:51:02 +01:00
lavamind
cc289f4c87 Merge branch 'master' into 'master'
Error out if cache directory does not exist when creating a fresh dup backup

See merge request riseuplabs/backupninja!15
2018-06-27 17:34:46 -07:00
Jerome Charaoui
1b1a857cbf Make sfdisk grep for luks headers more specific 2018-06-27 20:33:46 -04:00
lavamind
012dc70f60 Merge branch 'feature/support_luks_partitions' into 'master'
Support LUKS in disk partitions

See merge request riseuplabs/backupninja!13
2018-06-27 17:32:09 -07:00
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
Lyz
417394cf74
Changed /sed/@SED@/ 2018-06-25 16:31:16 +02: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
Hugh Nowlan
4725d7835f Correct path 2018-04-30 13:47:30 +01:00
Hugh Nowlan
f2bc6d60aa Error out if archive dir doesn't exist 2018-04-30 12:59:21 +01:00
Lyz
469a3fd5ab
Support LUKS in disk partitions 2018-04-30 12:29:23 +02: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
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
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
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
70873857b7 [borg] fixed connection testing (thanks @orel) 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
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
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