Merge branch 'keep_minutely' of thomasleveil/borgmatic into master

This commit is contained in:
Dan Helfman 2018-01-03 04:30:13 +00:00 committed by Gitea
commit a00407256d
3 changed files with 9 additions and 1 deletions

View file

@ -29,6 +29,8 @@ location:
retention:
# Retention policy for how many backups to keep in each category.
keep_minutely: 60
keep_hourly: 24
keep_daily: 7
keep_weekly: 4
keep_monthly: 6

View file

@ -122,6 +122,10 @@ map:
type: scalar
desc: Keep all archives within this time interval.
example: 3H
keep_minutely:
type: int
desc: Number of minutely archives to keep.
example: 60
keep_hourly:
type: int
desc: Number of hourly archives to keep.

View file

@ -44,6 +44,8 @@ def test_parse_configuration_transforms_file_into_mapping():
- hostname.borg
retention:
keep_minutely: 60
keep_hourly: 24
keep_daily: 7
consistency:
@ -57,7 +59,7 @@ def test_parse_configuration_transforms_file_into_mapping():
assert result == {
'location': {'source_directories': ['/home', '/etc'], 'repositories': ['hostname.borg']},
'retention': {'keep_daily': 7},
'retention': {'keep_daily': 7, 'keep_hourly': 24, 'keep_minutely': 60},
'consistency': {'checks': ['repository', 'archives']},
}