4bf3e906a1
Break out main borgmatic arguments-parsing code into a separate file.
2019-06-22 21:32:27 -07:00
0ca43ef67a
Get tests passing.
continuous-integration/drone/push Build is passing
2019-06-22 21:23:48 -07:00
75c04611dc
Refactor to support subparsed-based parsed arguments.
2019-06-22 16:10:07 -07:00
881dc9b01e
Make each subparser get a crack all all arguments.
2019-06-21 23:12:37 -07:00
8c72e909a7
Initial stab at subparsers for argument parsing. Not yet fully working.
2019-06-21 22:27:16 -07:00
74ac148747
Disable console color via "color" option in borgmatic configuration output section ( #191 ).
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2019-06-19 20:48:54 -07:00
be7887c071
Demote log level of unhelpful info log ( #194 ).
continuous-integration/drone/push Build is passing
2019-06-19 12:01:03 -07:00
b3aa6af859
Don't color syslog output ( #197 ).
continuous-integration/drone/push Build is passing
2019-06-17 11:53:08 -07:00
de94001508
Change default syslog verbosity to show errors only.
continuous-integration/drone/push Build was killed
2019-06-16 21:57:14 -07:00
6c136ebbf1
Fix for unclear error message for invalid YAML merge include ( #196 ).
continuous-integration/drone/push Build is passing
2019-06-16 21:33:40 -07:00
de82919e39
Skip coverage on a particular annoying-to-trigger branch in execution code.
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2019-06-13 21:38:06 -07:00
d6d66de251
Set umask used when executing hooks via "umask" option in borgmatic hooks section ( #189 ).
continuous-integration/drone/push Build is failing
2019-06-13 17:05:26 -07:00
7d7308a80d
Integration tests for execute.py.
2019-06-13 10:48:21 -07:00
7f126ce127
Move hook.py file up a level.
2019-06-13 10:09:16 -07:00
a6c4debf78
Additional test coverage, and upgrade test requirements.
2019-06-13 10:01:55 -07:00
a74ad5475e
Run all Borg commands such that they log to syslog as well as console.
continuous-integration/drone/push Build is passing
2019-06-12 20:56:20 -07:00
fa293828df
Run hooks such that their output goes to syslog as well as console.
continuous-integration/drone/push Build is passing
2019-06-12 13:09:04 -07:00
f5582b1754
Move borgmatic.borg.execute module up a level for broader use.
2019-06-12 12:13:59 -07:00
1af95714c2
Collapse two execute_command() parameters into one output log level parameter.
2019-06-12 12:11:36 -07:00
0406d18cfd
Log Borg --stats output as warning so it shows up at any verbosity level.
2019-06-12 11:49:35 -07:00
9a5e7a3abb
Successfully convert Borg output to Python logging entries.
continuous-integration/drone/push Build is passing
2019-06-11 16:42:04 -07:00
02eb6c7e09
Merge branch 'master' into logging
continuous-integration/drone/push Build is passing
2019-06-10 10:27:22 -07:00
418c09398c
Fix incorrect compression default in schema comment.
continuous-integration/drone/push Build is passing
2019-06-09 21:21:46 -07:00
12441331e6
Fix formatting / import ordering.
continuous-integration/drone/push Build is passing
2019-05-27 15:46:38 -07:00
9ceeae2de0
Add separate syslog verbosity flag.
continuous-integration/drone/push Build was killed
2019-05-27 15:44:48 -07:00
e0e493c2f1
Factor out configuring of logging into a common function.
continuous-integration/drone/push Build is failing
2019-05-27 15:05:26 -07:00
0f05f7ad93
Log to syslog in addition to existing standard out logging ( #53 ).
continuous-integration/drone/push Build is passing
2019-05-26 16:34:46 -07:00
fb7a6dccaa
Link to docs on skipping pruning entirely.
continuous-integration/drone/push Build is passing
2019-05-21 12:32:19 -07:00
8424e443a9
Also read .yml ending configuration files
...
Closes witten/borgmatic#178 .
2019-05-19 13:04:42 +02:00
9417359da3
Fix for regression with missing verbose log entries ( #177 ).
2019-05-16 10:50:19 -07:00
1cf0e1bd84
Support for various Borg directory environment variables ( #153 ).
2019-05-16 10:34:52 -07:00
1c0dc3f904
Run isort over the source
2019-05-14 18:59:19 +02:00
a13cc0ab17
More tests for colored logging.
2019-05-13 21:10:26 -07:00
620f9e64d6
A few more tests for new colored logging.
2019-05-13 20:49:20 -07:00
37362150fe
Color records that are logged via logger.handle() as well.
2019-05-13 13:50:32 -07:00
1f524d6c87
Add borgmatic custom logger
2019-05-13 13:40:18 +02:00
8650a15db1
Document validate-borgmatic-config and add a few tests.
2019-05-11 14:05:16 -07:00
52e4f48eb9
Add validate-borgmatic-config command
...
Useful when generating the borgmatic configuration file with
configuration management and before moving the generated file in place
checking if it is actually valid.
2019-05-10 00:10:28 +02:00
a291477c19
Fix for hooks executing when using --dry-run ( #160 ).
2019-05-07 16:06:31 -07:00
1c88dda76a
Fix for invalid JSON output when using multiple borgmatic configuration files ( #155 ).
2019-04-02 22:30:14 -07:00
0b59c22c23
Fix for seemingly random filename ordering when running through a directory of configuration files ( #157 ).
2019-03-30 16:41:21 -07:00
6ff1867312
Configuration files includes and merging ( #148 ).
2019-03-06 12:06:27 -08:00
3cb52423d2
Support for Borg create/extract --numeric-owner flag ( #147 ).
2019-03-05 09:11:35 -08:00
4272c6b077
List the files within an archive via --list --archive option ( #140 ).
2019-02-23 23:02:17 -08:00
fe92d9e838
Fix restore paths list to tuple conversion.
2019-02-18 21:59:09 -08:00
5ea2d644a2
Fix error handling when --extract repository guard fails.
2019-02-18 21:52:56 -08:00
c35f90154f
Only guard repository when --extract is used.
2019-02-18 21:43:30 -08:00
2b3b8eab71
Add archive extract to end-to-end test.
2019-02-18 13:47:18 -08:00
aa7c7651e5
Fix config repositories consumption.
2019-02-18 13:27:35 -08:00
c41ffb5ceb
If no extract repository is given, then error if there are multiple configured repositories.
2019-02-18 13:22:14 -08:00
766a03375a
Guard that the given repository occurs in config exactly once.
2019-02-18 12:58:39 -08:00
2a4d4247e3
Tests for extract_archive().
2019-02-18 10:31:52 -08:00
9de5083a7e
Additional test coverage for extract options in borgmatic command.
2019-02-18 09:52:56 -08:00
d0557b2bcd
Initial work on #123 : Support for Borg extract.
2019-02-18 09:30:34 -08:00
1a980d6321
Organize options within command-line help into logical groups.
2019-02-12 22:27:04 -08:00
fb21d4e645
Remove dead code.
2019-02-09 21:17:55 -08:00
6096a7181c
Leave exclude_patterns glob expansion to Borg, since doing it in borgmatic leads to confusing behavior ( #132 ).
2019-01-27 13:47:26 -08:00
fa9dfb8ff7
Remove date echo from schema example, as it's not a substitute for real logging ( #127 ).
2019-01-27 12:22:22 -08:00
2dc006aab4
Allow use of --stats flag when --create or --prune flags are implied ( #139 ).
2019-01-27 12:15:47 -08:00
031b9d6faf
Handle and format validation errors raised during argument parsing ( #136 ).
2019-01-27 11:58:04 -08:00
09d521661f
Remove weasel words like "easily" and "simply".
2018-12-25 22:03:34 -08:00
fd46efb193
Add borgmatic --version command-line flag to get the current installed version number.
2018-12-25 21:01:08 -08:00
426f54c9cc
When generating sample configuration, document the defaults for each option ( #103 ).
2018-12-25 17:05:22 -08:00
45a537b6b1
When running multiple configuration files, attempt all of them even if one errors ( #116 ).
2018-12-25 15:23:54 -08:00
30b52e5523
With --init command-line flag, if a repository already exists, proceed without erroring ( #117 ).
2018-12-24 22:28:02 -08:00
14aeddc11f
Black re-formatting.
2018-12-24 14:38:57 -08:00
066399ecdb
Mention --stats command-line flag in NEWS file.
2018-12-23 16:06:08 -08:00
7516443a89
fix changes requested about stats
2018-12-22 23:46:03 +01:00
73d67e29b4
Support for Borg create & prune --stats via borgmatic command-line flag ( #100 )
2018-12-22 23:27:24 +01:00
cc9dbb1def
Support for Borg repository initialization via borgmatic --init command-line flag ( #110 ).
2018-12-10 22:20:57 -08:00
300ead65d3
Error when deprecated --excludes command-line option is used.
2018-12-09 14:57:14 -08:00
7417a3cd00
Update Borg create --filter values so a dry run lists files to back up. ( #111 ).
2018-12-02 15:03:07 -08:00
9ca80a54d8
Support for Borg create --progress via borgmatic command-line flag ( #108 ).
2018-11-21 22:03:39 -08:00
5c0b17ef39
Support for Borg --chunker-params create option via "chunker_params" in borgmatic's storage section ( #105 ).
2018-10-27 15:57:28 -07:00
695930a607
Fix for syntax error that occurred in Python 3.5 and below ( #102 ).
2018-10-15 08:47:15 -07:00
fa38de2de7
Enable consistency checks for only certain repositories via "check_repositories" ( #73 ).
2018-10-13 20:34:51 -07:00
e4d1b49c39
Switch some functions with many arguments to kwargs only.
2018-10-13 15:19:16 -07:00
2f20e6f808
Include link to issue tracker within various command output.
2018-10-07 22:29:56 -07:00
da8e9638f4
Support for Borg --keep-secondly prune option ( #98 ).
2018-10-04 21:54:23 -07:00
a125df991b
Move tests to the root of the repository, in keeping with more common convention.
2018-09-30 13:57:20 -07:00
56ad1d164a
Use Flake8 code checker as part of running automated tests.
2018-09-29 23:15:18 -07:00
76d6a69f5a
Use Black code formatter as part of running automated tests.
2018-09-29 22:45:00 -07:00
746428ed44
Fix generated configuration to also include a "keep_daily" value so pruning works out of the box.
2018-09-29 15:44:37 -07:00
984702b3b2
Fix various warnings.
2018-09-29 15:06:57 -07:00
47efa88c9d
In generate-borgmatic-config, comment out all optional config ( #57 ).
2018-09-29 15:03:11 -07:00
596f6f9dac
Update help/README about --create --json.
2018-09-27 08:12:54 -07:00
Nils Hesse
98cb2644db
check_archives does not take json parameter
2018-09-27 12:21:14 +02:00
Florian Lindner
9aaf78b9dd
Add --json option for --create command line.
...
Closes #94 .
2018-09-24 21:53:09 +02:00
a836ec944f
Limit argument range for --verbose, make default log level more explicit. ( #93 )
2018-09-18 05:31:27 +00:00
c5ff08ee25
Remove now-gone verbosity parameter from test.
2018-09-09 11:14:33 -07:00
856db29180
Mention --read-special in NEWS.
2018-09-09 10:42:06 -07:00
Steve Kerrison
20e09b4ea8
Support for Borg create --read-special via "read_special" option ( #25 ).
2018-09-09 10:39:56 -07:00
7252b8d614
Rework logging/verbosity system ( #90 )
...
Looks great, merged! Thanks again for all your hard work here.
2018-09-08 20:53:37 +00:00
9b48eb5a61
Clarify that --json can be used with --info command-line flag.
2018-08-19 12:57:52 -07:00
7d40a448cb
Pass --show-rc option to Borg when at highest verbosity level ( #89 ).
2018-08-19 12:44:40 -07:00
da7aed3814
Support for Borg create --checkpoint-interval ( #87 ).
2018-08-19 11:41:49 -07:00
7b77fd2510
Fix compatibility issue between pykwalify and ruamel.yaml 0.15.52 ( #85 ).
2018-08-11 13:59:27 -07:00
282e9565c9
Mentioning new --info --json option in NEWS.
2018-07-28 20:24:19 -07:00
b714ffd48b
add support for --info --json ( #83 )
2018-07-29 03:17:45 +00:00
d93da55ce9
Add code style guidelines to the documention, and reformat some code accordingly.
2018-07-28 15:02:17 -07:00
789bcd402a
add support for --list --json ( #74 )
2018-07-28 21:21:38 +00:00
cf6ab60d2e
Use XDG_CONFIG_HOME for user configuration directory, if set. (Thanks to floli.) ( #71 )
...
Thanks! This will go out in the next release.
2018-07-25 01:34:05 +00:00
64364b20ff
Skip non-"*.yaml" config filenames in /etc/borgmatic.d/ so as not to parse backup files, editor swap files, etc. ( #77 )
2018-07-22 12:08:49 -07:00
d664b6d253
only run hooks when creating an archive
...
fix #72
2018-07-01 21:09:45 +02:00
cf846ab8ac
Support for Borg prune --umask option ( #69 ).
2018-06-17 15:12:43 -07:00
dede8f9d4b
News for: ~/.config/borgmatic/config.yaml.
2018-06-17 14:30:47 -07:00
Florian Lindner
9bd77292ff
Add default path for user configuration
2018-06-10 15:03:23 +02:00
765e343c71
Support for Borg --info via borgmatic command-line ( #61 ).
2018-05-26 16:19:05 -07:00
af4b91a048
Support for Borg --list option via borgmatic command-line to list all archives ( #61 ).
2018-05-26 16:09:08 -07:00
cc9044487b
Support for Borg --nobsdflags option to skip recording bsdflags (e.g. NODUMP, IMMUTABLE) in archive ( #63 ).
2018-05-26 15:09:23 -07:00
007ec0644c
Ignore "check_last" and consistency "prefix" when "archives" not in consistency checks. ( #59 )
2018-05-20 22:11:40 -07:00
f7f852a28b
Fix tests broken by addition of check --prefix default.
2018-03-03 22:36:51 -08:00
9b9c4c4abb
Clarifying note in schema about adding prefix to consistency section.
2018-03-03 22:33:34 -08:00
1b59f5b190
Changing version in warning to correspond with next release version.
2018-03-03 22:30:30 -08:00
Nick Whyte
c64d0100d5
Only check archives with matching prefix.
2018-03-03 22:17:39 -08:00
2d3f5fa05d
Support for Borg --lock-wait option for the maximum wait for a repository/cache lock ( #56 ).
2018-02-19 15:51:04 -08:00
a87036ee46
Support for using tilde in exclude_patterns to reference home directory ( #58 ).
2018-02-18 15:34:19 -08:00
a72f5ff69a
Tests for --dry-run + --verbosity fix.
2018-02-18 14:26:51 -08:00
newtonne
bb99009191
Fix issue when using both --dry-run and -v options.
2018-02-18 14:18:25 -08:00
4c45d60529
Mentioning ssh_command for additional SSH configuration..
2018-02-18 13:39:05 -08:00
newtonne
e55e9e8139
Add encryption_passcommand configuration option
2018-01-16 21:03:25 -08:00
62526038d6
47: Support for Borg --dry-run option via borgmatic command-line.
2018-01-15 20:55:27 -08:00
bf2f39623e
49: Rename incorrect --pattern-from option to correct --patterns-from.
2018-01-15 20:22:53 -08:00
cd189c4fe4
48: Add "local_path" to configuration for specifying an alternative Borg executable path.
2018-01-14 16:35:24 -08:00
b8f6bab12d
49: Support for Borg experimental --patterns-from and --patterns options for specifying mixed includes/excludes.
2018-01-14 15:52:19 -08:00
50b3240c4f
54: Fix for incorrect consistency check flags passed to Borg when all three checks in borgmatic config.
2018-01-14 14:09:20 -08:00
24b5eccefc
add support for Borg --keep-minutely prune option
2018-01-03 00:13:44 +01:00
Dan
3e26e70d0c
Fix for incorrect /etc/borgmatic.d/ configuration path probing on macOS.
2017-11-10 21:33:29 -08:00
Dan
425e27dee5
Add "ssh_command" to configuration for specifying a custom SSH command or options.
2017-11-03 22:01:04 -07:00
Dan
ca4312bb85
Support for Borg --remote-ratelimit for limiting upload rate. And log Borg commands.
2017-11-02 22:22:40 -07:00
Dan
fc3b1fccba
Support for Borg --files-cache option for setting the files cache operation mode.
2017-11-02 22:03:11 -07:00
Dan
f83346b9b3
Support for using tilde in repository paths to reference home directory.
2017-11-02 21:34:04 -07:00
Dan
63c7241aec
Typo in comment.
2017-10-31 22:21:49 -07:00
Dan
fd77dc579e
Pass through several more Unix signals that Borg happens to consume.
2017-10-31 22:10:00 -07:00
Dan
f017ed648f
Disabling code coverage on this one-line functions.
2017-10-31 22:01:18 -07:00
Dan
27a6745743
Passing the Unix SIGTERM signal through to child processes like Borg.
2017-10-31 21:58:35 -07:00
Dan
f495550ad7
Default "prefix" to "{hostname}-" if not specified.
2017-10-29 20:14:18 -07:00
Dan
43d0e597a2
Require "prefix" in retention section when "archive_name_format" is set.
2017-10-29 19:36:26 -07:00
Dan
f1c07b5cf5
Updated dead links to Borg documentation.
2017-10-29 17:05:49 -07:00
Dan
f2782426d5
Comment typo.
2017-10-29 16:46:30 -07:00
Dan
f13ed92b0e
Breaking borgmatic command main() apart, since it was getting a little unwieldy.
2017-10-29 16:44:15 -07:00
cc94e5f52f
Add tests for verbosity mapping.
2017-10-25 22:36:23 -07:00
16f0a3976c
Adding logging to hook execution!
2017-10-25 22:32:06 -07:00
30f56235c1
Fixing inconsistent indentation.
2017-10-25 21:58:02 -07:00
a5aa9355f5
Merge.
2017-10-25 21:54:50 -07:00
059322b7f8
Improve clarity of logging spew at high verbosity levels.
2017-10-25 21:47:33 -07:00
Johannes Feichtner
80e2c023dd
#16 , #38 : Support for user-defined hooks before/after backup, or on error.
2017-10-26 06:38:27 +02:00
873fc22cfb
Removing "from __future__ import print_function". This isn't Python 2 anymore, Toto.
2017-09-09 17:38:14 -07:00
86cc6ca869
#29 : Support for using tilde in source directory path to reference home directory.
2017-09-09 17:23:31 -07:00
84c148fb3b
#39 : Fix to make /etc/borgmatic/config.yaml optional rather than required when using the default config paths.
2017-09-08 21:25:42 -07:00
Michele Lazzeri
867d3fceb0
Added storage.archive_name_format to config ( #16 )
...
* Added storage.archive_name_format to config
2017-09-03 20:13:14 +02:00
7c048d1989
Fix for traceback when "exclude_from" value is empty in configuration file.
2017-08-27 10:01:49 -07:00
e3a559e13b
When pruning, make highest verbosity level list archives kept and pruned.
2017-08-26 16:07:30 -07:00
b1f429f4b5
#12 , #35 : Support for Borg --exclude-from, --exclude-caches, and --exclude-if-present options.
2017-08-05 23:32:39 -07:00
ddd56bf2a7
Remove unused imports.
2017-08-05 22:26:38 -07:00
793ffbd048
Fix imports of borg/*.py modules now that they've been split out.
2017-08-05 22:26:28 -07:00
247d36a309
Split out Borg integration code into multiple files, as it was getting kind of hairy all in one.
2017-08-05 16:21:39 -07:00
e85d487c3a
#34 : New "extract" consistency check that performs a dry-run extraction of the most recent archive.
2017-07-30 11:16:26 -07:00
ceeaf25443
#17 : Added command-line flags for performing a borgmatic run with only pruning, creating, or checking enabled.
2017-07-28 22:02:18 -07:00
7ed5b33db5
#14 : Support for running multiple config files in /etc/borgmatic.d/ from a single borgmatic run.
2017-07-25 21:18:51 -07:00
57b3066987
Fix for generate-borgmatic-config writing config with invalid one_file_system value.
2017-07-25 20:32:32 -07:00
3967e1b5f0
#32 : Fix for passing check_last as integer to subprocess when calling Borg.
2017-07-24 19:29:26 -07:00
c38f7a3693
#32 : Fix for upgrade-borgmatic-config converting check_last option as a string instead of an integer.
2017-07-24 08:41:02 -07:00
499f8aa0a4
Support for backing up to multiple repositories.
2017-07-22 22:56:46 -07:00
548212274f
Renaming group to section for consistency.
2017-07-22 22:17:37 -07:00
1292dd2162
To free up space, now pruning backups prior to creating a new backup.
2017-07-22 21:50:29 -07:00
2274cfe480
Fixing gets on config group names.
2017-07-22 21:19:26 -07:00
ac2a63763f
Removing TODO that basically entails testing ruamel.yaml round-tripping, which in theory already has its own tests.
2017-07-22 20:31:26 -07:00
8b2b41eefc
Fixing up borg module to deal with new parsed config file structures.
2017-07-22 20:11:49 -07:00
fb172f018a
TODO about using the new exclude_patterns.
2017-07-10 16:26:32 -07:00
b1355e75c4
Bail if "--excludes" argument is provided, as it's now deprecated in favor of configuration file.
2017-07-10 16:25:13 -07:00
ef32b292a8
Provide helpful message when borgmatic is run with only legacy config present.
2017-07-10 16:06:02 -07:00
61f88228b0
When writing config, make containing directory if necessary. Also default to tighter permissions.
2017-07-10 15:20:50 -07:00
f98558546c
Documentation updates based on the new YAML configuration.
2017-07-10 11:06:28 -07:00
9cc7c77ba9
Don't overwrite config files. And retain file permissions when upgrading config.
2017-07-10 10:37:11 -07:00
3b1b058ffe
Display result of config upgrade.
2017-07-10 10:13:57 -07:00
9a3b52e1fd
Fixing tests broken by excludes merging.
2017-07-10 10:09:06 -07:00
0dfc935af6
Merge excludes into config file format.
2017-07-10 09:43:25 -07:00
2f7527a333
Completed test coverage of commands (except for main()s).
2017-07-09 17:03:45 -07:00
263891f414
Add a version to the schema, because inevitably I'll want to revise the schema.
2017-07-09 16:18:10 -07:00
644c2e6612
Adding TODO about a helpful notice about legacy config.
2017-07-09 11:49:51 -07:00
f581f4b8d9
More test coverage, and simplification of config generation.
2017-07-09 11:41:55 -07:00
c7803a2814
Adding a "does not raise" test for displaying errors.
2017-07-09 10:27:34 -07:00
f4e5dc8382
Adding test coverage report. Making tests a little less brittle.
2017-07-08 23:01:41 -07:00
f19a40ef9c
Basic YAML generating / validating / converting to.
2017-07-08 22:33:51 -07:00
483bd50bdf
Tests for YAML config code.
2017-07-04 18:32:37 -07:00
5110e64e63
Integrating YAML config into borgmatic and updating README.
2017-07-04 18:23:59 -07:00
4d7556f68b
Basic YAML configuration file parsing.
2017-07-04 16:52:24 -07:00
9212f87735
Dropped Python 2 support. Now Python 3 only.
2017-07-02 17:18:33 -07:00
a45d7bec81
#21 : Fix for verbosity flag not actually causing verbose output.
2016-06-23 07:13:25 -07:00
ed0127df91
#20 : Fix for traceback when remote_path option is missing.
2016-06-13 08:53:41 -07:00
3579dbe813
#19 : Support for Borg's --remote-path option to use an alternate Borg executable.
2016-06-10 13:31:37 -07:00
40a215802f
Dropping support for Attic.
2016-06-10 11:21:53 -07:00
