1
0
Fork 0
mirror of https://github.com/roles-ansible/ansible_role_restic_archiver.git synced 2024-08-16 10:09:49 +02:00

Merge branch 'master' into use-regex-escape

This commit is contained in:
Matthias Leutenegger 2020-06-03 08:46:37 +02:00
commit 9dd9b65327
3 changed files with 16 additions and 2 deletions

View file

@ -7,6 +7,12 @@ and [human-readable changelog](https://keepachangelog.com/en/1.0.0/).
### Changed ### Changed
* Password now use `regex_escape()` filter in templates * Password now use `regex_escape()` filter in templates
## [0.2.5] - 2020-06-02
### Fixed:
* AWS credentials are now supplied to the initialising step
* Cronjob step does not fail if `scheduled` parameter is not set on repo
* init respects `'config already initialized'` string
## [0.2.4] - 2020-06-01 ## [0.2.4] - 2020-06-01
### Added ### Added
* `aws_default_region` for repos * `aws_default_region` for repos
@ -62,7 +68,8 @@ and [human-readable changelog](https://keepachangelog.com/en/1.0.0/).
* initial release * initial release
[Unreleased]: https://github.com/arillso/ansible.restic/compare/0.2.4...HEAD [Unreleased]: https://github.com/arillso/ansible.restic/compare/0.2.5...HEAD
[0.2.5]: https://github.com/arillso/ansible.restic/compare/0.2.4...0.2.5
[0.2.4]: https://github.com/arillso/ansible.restic/compare/0.2.3...0.2.4 [0.2.4]: https://github.com/arillso/ansible.restic/compare/0.2.3...0.2.4
[0.2.3]: https://github.com/arillso/ansible.restic/compare/0.2.2...0.2.3 [0.2.3]: https://github.com/arillso/ansible.restic/compare/0.2.2...0.2.3
[0.2.2]: https://github.com/arillso/ansible.restic/compare/0.2.1...0.2.2 [0.2.2]: https://github.com/arillso/ansible.restic/compare/0.2.1...0.2.2

View file

@ -4,12 +4,19 @@
environment: environment:
RESTIC_REPOSITORY: '{{ item.value.location }}' RESTIC_REPOSITORY: '{{ item.value.location }}'
RESTIC_PASSWORD: '{{ item.value.password }}' RESTIC_PASSWORD: '{{ item.value.password }}'
AWS_ACCESS_KEY_ID: '{{ item.value.aws_access_key | default("") }}'
AWS_SECRET_ACCESS_KEY: '{{
item.value.aws_secret_access_key
| default("")
}}'
AWS_DEFAULT_REGION: '{{ item.value.aws_default_region | default("") }}'
no_log: true no_log: true
register: restic_init register: restic_init
changed_when: "'created restic repository' in restic_init.stdout" changed_when: "'created restic repository' in restic_init.stdout"
failed_when: failed_when:
- restic_init.rc != 0 - restic_init.rc != 0
- not 'config file already exists' in restic_init.stderr - not 'config file already exists' in restic_init.stderr
- not 'config already initialized' in restic_init.stderr
loop: "{{ restic_repos|dict2items }}" loop: "{{ restic_repos|dict2items }}"
when: when:
- item.value.init is defined - item.value.init is defined

View file

@ -45,5 +45,5 @@
when: when:
- restic_create_cron - restic_create_cron
- item.name is defined - item.name is defined
- item.scheduled - item.scheduled | default(false)
with_items: '{{ restic_backups }}' with_items: '{{ restic_backups }}'