From 632cc1df47b32b0f8d7c3d9ae4d1f748ed8b6954 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sat, 4 Feb 2023 20:38:34 +0100 Subject: [PATCH] copr: incremental backup to storinator, part 3 - fix crontab specification - better timing plan default --- roles/rsnapshot-push/tasks/main.yml | 13 +++++++------ roles/rsnapshot-push/templates/server-daemon.sh.j2 | 8 +------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/roles/rsnapshot-push/tasks/main.yml b/roles/rsnapshot-push/tasks/main.yml index 9d0b9b3b7c..994d2dac0e 100644 --- a/roles/rsnapshot-push/tasks/main.yml +++ b/roles/rsnapshot-push/tasks/main.yml @@ -47,11 +47,12 @@ tags: rsnapshot_push - name: backup praiskup data - cron: name="backup documents - {{ item.key }}" - minute="0/5" - hour="*" - user={{ item.value.user }} - job=/usr/local/bin/"{{ item.value.command }}" + cron: + name: "backup documents - {{ item.key }}" + minute: "*/5" + hour: "*" + user: "{{ item.value.user }}" + job: "/usr/local/bin/{{ item.value.command }}" with_dict: - - "{{ rsnapshot_push.cases }}" + - "{{ rsnapshot_push.cases }}" tags: rsnapshot_push diff --git a/roles/rsnapshot-push/templates/server-daemon.sh.j2 b/roles/rsnapshot-push/templates/server-daemon.sh.j2 index acfdb462d2..0658141dfc 100644 --- a/roles/rsnapshot-push/templates/server-daemon.sh.j2 +++ b/roles/rsnapshot-push/templates/server-daemon.sh.j2 @@ -18,14 +18,8 @@ cmd_rsync /usr/bin/rsync cmd_du /usr/bin/du cmd_ssh /usr/bin/ssh -{% if 'timing_plan' in item.value %} -{% set timing_plan = item.value.timing_plan %} -{% else %} -{% set timing_plan = 'normal' %} -{% endif %} -{% if timing_plan in rsnapshot_push_defaults.timing_plans %} +{% set timing_plan = item.value.timing_plan | default('normal') %} {% set plan = rsnapshot_push_defaults.timing_plans[timing_plan] %} -{% endif %} {% if 'timing_plans' in rsnapshot_push and timing_plan in rsnapshot_push.timing_plans %} {% set plan = rsnapshot_push.timing_plans[timing_plan] %} {% endif %}