diff --git a/roles/ynh_backup/README-FR.md b/roles/ynh_backup/README-FR.md index c6096ed0496ede5bdcbbde383581e85e6991fa8b..116d2d7ef1f1216a99542872a1c6161965b5d282 100644 --- a/roles/ynh_backup/README-FR.md +++ b/roles/ynh_backup/README-FR.md @@ -24,7 +24,7 @@ Nous avons intégré trois systèmes de sauvegardes différents à ce rôle Yuno ```yml ynh_backup: scheduled: True - directory: "/data/backup" + directory: "/data/backup/local_ynh_backups" scheduled_hour: "*" scheduled_minute: "*/30" scheduled_weekday: "*" @@ -49,7 +49,7 @@ ynh_backup: ```yml ynh_borg_backup_scheduled: True borg_source_directories: "{{ ynh_backup.directory }}" -borg_repository: "/data/backup/borg_repository" +borg_repository: "{{ ynh_backup.directory }}/borg_repository" borg_encryption_passphrase: "PLEASECHANGEME" borgmatic_config_name: "borgmatic_ynh_config" borgmatic_cron_name: "borgmatic_ynh_cron" @@ -100,13 +100,13 @@ restic_repos: restic_backups: YunoHost_remote: - name: "remote_ynh_restic" - repo: "s3_ynh_restic_repo" - src: "{{ ynh_backup.directory }}" + name: "remote_ynh_restic" + repo: "s3_ynh_restic_repo" + src: "{{ ynh_backup.directory }}" tags: - yunohost - remote - keep_within: "{{ restic_keep_time }}" + keep_within: "{{ restic_keep_time }}" scheduled: True schedule_hour: 1 schedule_minute: 0 diff --git a/roles/ynh_backup/README.md b/roles/ynh_backup/README.md index d5011a29af943e264336188cb5f3c48f2de33fcb..d6ce924871e8de46d71e3143a572597387934678 100644 --- a/roles/ynh_backup/README.md +++ b/roles/ynh_backup/README.md @@ -24,7 +24,7 @@ YunoHost provides its own native backup system. It is able to back up YunoHost c ```yml ynh_backup: scheduled: True - directory: "/data/backup" + directory: "/data/backup/local_ynh_backups" scheduled_hour: "*" scheduled_minute: "*/30" scheduled_weekday: "*" @@ -49,7 +49,7 @@ ynh_backup: ```yml ynh_borg_backup_scheduled: True borg_source_directories: "{{ ynh_backup.directory }}" -borg_repository: "/data/backup/borg_repository" +borg_repository: "{{ ynh_backup.directory }}/borg_repository" borg_encryption_passphrase: "PLEASECHANGEME" borgmatic_config_name: "borgmatic_ynh_config" borgmatic_cron_name: "borgmatic_ynh_cron" @@ -100,13 +100,13 @@ restic_repos: restic_backups: YunoHost_remote: - name: "remote_ynh_restic" - repo: "s3_ynh_restic_repo" - src: "{{ ynh_backup.directory }}" + name: "remote_ynh_restic" + repo: "s3_ynh_restic_repo" + src: "{{ ynh_backup.directory }}" tags: - yunohost - remote - keep_within: "{{ restic_keep_time }}" + keep_within: "{{ restic_keep_time }}" scheduled: True schedule_hour: 1 schedule_minute: 0 diff --git a/roles/ynh_backup/defaults/main.yml b/roles/ynh_backup/defaults/main.yml index b6423c7e504975bc57ae2790831a24514c75f599..d5422029f5d76d07a3b0591bb0f2b653a049399f 100644 --- a/roles/ynh_backup/defaults/main.yml +++ b/roles/ynh_backup/defaults/main.yml @@ -34,8 +34,7 @@ ynh_borg_backup_remote_repo: False # Variables for YunoHost Restic # https://github.com/roles-ansible/ansible_role_restic ynh_restic_backup_scheduled: False +do1jlr_restic_version: "v0.7.1" restic_version: "0.12.1" restic_schedule_type: "cronjob" -do1jlr_restic_version: "v0.7.1" - restic_keep_time: "0y1m0d0h"