Merge pull request #102 from UvixCreative/backup_now

Backup now

README.md

@@ -66,7 +66,7 @@ ansible-galaxy install do1jlr.restic
 ## Role Variables
 
 | Name                          | Default                         | Description                                                                                                                                          |
-| ----------------------    | ----------------------------------- | --------------------------------------------------------------------------- |
+|-------------------------------|---------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `restic_url`                  | `undefined`                     | The URL to download restic from. Use this variable to overwrite the default                                                                          |
 | `restic_version`              | `'0.15.1'`                      | The version of Restic to install                                                                                                                     |
 | `restic_download_path`        | `'/opt/restic'`                 | Download location for the restic binary                                                                                                              |
@@ -76,6 +76,7 @@ ansible-galaxy install do1jlr.restic
 | `restic_repos`                | `{}`                            | A dictionary of repositories where snapshots are stored. *(More Info: [Repos](#Repos))*                                                              |
 | `restic_backups`              | `{}` (or `[]`)                  | A list of dictionaries specifying the files and directories to be backed up *(More Infos: [Backups](#Backups))*                                      |
 | `restic_create_schedule`      | `false`                         | Should we schedule each backup? Either via cronjob or via systemd timer.                                                                             |
+| `restic_backup_now`           | `false`                         | Whether or not the backup script should be run immediately                                                                                           |
 | `restic_schedule_type`        | `systemd`                       | Here you can define if we create a ``cronjob`` or a ``systemd`` timer. If it fails to create a systemd timer, a cronjob will be created.             |
 | `restic_dir_owner`            | `'{{ansible_user}}'`            | The owner of all created dirs                                                                                                                        |
 | `restic_dir_group`            | `'{{ansible_user}}'`            | The group of all created dirs                                                                                                                        |

defaults/main.yml

@@ -9,6 +9,7 @@ restic_repos: {}
 restic_backups: []
 restic_create_schedule: "{{ restic_create_cron }}"
 restic_schedule_type: "systemd"
+restic_backup_now: false
 # restic_schedule_type: "cronjob"
 restic_no_log: true
 

tasks/main.yml

@@ -33,3 +33,7 @@
     distribution: '{{ ansible_distribution }}'
     distribution_version: '{{ ansible_distribution_version }}'
     distribution_major_version: '{{ ansible_distribution_major_version }}'
+
+- name: Run backups now
+  ansible.builtin.include_tasks: 'run_backup.yml'
+  when: restic_backup_now | bool

tasks/run_backup.yml

@@ -0,0 +1,10 @@
+---
+- name: (RUN BACKUP) Run backup script
+  ansible.builtin.command:
+    cmd: "/usr/bin/env sh {{ restic_script_dir }}/backup-{{ item.name | replace(' ', '') }}.sh"
+  no_log: "{{ restic_no_log }}"
+  with_items: '{{ restic_backups }}'
+  when:
+    - item.name is defined
+  register: result
+  changed_when: result.rc != 0