From 8be503893e202e6d557d49d6653dd87ffd33170d Mon Sep 17 00:00:00 2001 From: Sondre Batalden Date: Fri, 24 May 2024 13:27:34 +0200 Subject: [PATCH 1/2] past backup script --- templates/restic_script_Linux.j2 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/templates/restic_script_Linux.j2 b/templates/restic_script_Linux.j2 index 7a42849..105603c 100644 --- a/templates/restic_script_Linux.j2 +++ b/templates/restic_script_Linux.j2 @@ -27,15 +27,18 @@ fi {% set pre_backup_cmd_result_log, pre_backup_cmd_output_log = "/dev/null", "/dev/null" %} {% set backup_result_log, backup_output_log = "/dev/null", "/dev/null" %} {% set forget_result_log, forget_output_log = "/dev/null", "/dev/null" %} +{% set past_backup_cmd_result_log, past_backup_cmd_output_log = "/dev/null", "/dev/null" %} {% else %} {% if (item.log_to_journald is defined and item.log_to_journald) %} {% set pre_backup_cmd_result_log, pre_backup_cmd_output_log = "| systemd-cat -t " + item.name, "2>&1 | systemd-cat -t " + item.name %} {% set backup_result_log, backup_output_log = "| systemd-cat -t " + item.name, "2>&1 | systemd-cat -t " + item.name %} {% set forget_result_log, forget_output_log = "| systemd-cat -t " + item.name, "2>&1 | systemd-cat -t " + item.name %} +{% set past_backup_cmd_result_log, past_backup_cmd_output_log = "| systemd-cat -t " + item.name, "2>&1 | systemd-cat -t " + item.name %} {% else %} {% set pre_backup_cmd_result_log, pre_backup_cmd_output_log = ">> " + restic_log_dir + "/" + item.name + "-pre_backup_cmd-result.log", "| tee " + restic_log_dir + "/" + item.name + "-pre_backup_cmd-output.log" %} {% set backup_result_log, backup_output_log = ">> " + restic_log_dir + "/" + item.name + "-backup-result.log", "| tee " + restic_log_dir + "/" + item.name + "-backup-output.log" %} {% set forget_result_log, forget_output_log = ">> " + restic_log_dir + "/" + item.name + "-forget-result.log", "| tee " + restic_log_dir + "/" + item.name + "-forget-output.log" %} +{% set past_backup_cmd_result_log, past_backup_cmd_output_log = ">> " + restic_log_dir + "/" + item.name + "-past_backup_cmd-result.log", "| tee " + restic_log_dir + "/" + item.name + "-past_backup_cmd-output.log" %} {% endif %} {% endif %} @@ -316,5 +319,23 @@ else {{ ' ' }}Please repair the restic-{{ item.name | replace(' ', '') }} job." {% endif %} fi + +{% if item.past_backup_cmd is defined %} + {{ item.past_backup_cmd }} {{ past_backup_cmd_output_log }} +if [[ $? -eq 0 ]] +then + echo "$(date -u '+%Y-%m-%d %H:%M:%S') OK" {{ past_backup_cmd_result_log }} +else + echo "$(date -u '+%Y-%m-%d %H:%M:%S') ERROR" {{ past_backup_cmd_result_log }} + {% if item.mail_on_error is defined and item.mail_on_error == true %} + mail -s "restic backup failed on {{ ansible_hostname }}" {{ item.mail_address }} <<< "Something went wrong while running restic backup script running at {{ ansible_hostname }} at $(date -u '+%Y-%m-%d %H:%M:%S'). + {%- if item.src is defined -%} + {{ ' ' }}We tried to backup '{{ item.src }}'. + {%- endif -%} + {{ ' ' }}Please repair the restic-{{ item.name | replace(' ', '') }} job." + {% endif %} +fi +{% endif %} + rm -f $pid # remove pid file just before exiting exit From 305eed34f5f07f68bdb1f9599e58e85a86c58877 Mon Sep 17 00:00:00 2001 From: Sondre Batalden Date: Fri, 24 May 2024 13:55:36 +0200 Subject: [PATCH 2/2] updated readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a0ac122..2c03ef1 100644 --- a/README.md +++ b/README.md @@ -163,6 +163,7 @@ Available variables: | `stdin_cmd` | no (yes if `stdin` == `true`) | The command to produce the stdin. | | `stdin_filename` | no | The filename used in the repository. | | `pre_backup_cmd` | no | A command to run before backup, typically used to dump databases to disk | +| `past_backup_cmd` | no | A command to run after backup, typically used to cleanup database dumps on disk | | `tags` | no | Array of default tags | | `keep_last` | no | If set, only keeps the last n snapshots. | | `keep_hourly` | no | If set, only keeps the last n hourly snapshots. |