Add stage parameter for backup hooks and add immich_upload backup

playbooks/filter_plugins/map_backup_locations.py

@@ -1,5 +1,11 @@
 import copy
 
+def hooks_add_or_create(location, key, value):
+    if key in location["hooks"]:
+        location["hooks"][key].append(value)
+    else:
+        location["hooks"][key] = [value]
+
 class FilterModule(object):
     def filters(self):
         return {
@@ -22,16 +28,17 @@ class FilterModule(object):
             if location["type"] == "docker":
                 new_location["from"] = name
                 new_location["type"] = "volume"
-            if location["type"] == "docker_remote":
-                new_location["from"] = name
-                new_location["type"] = "volume"
 
             if location["type"] == "hook":
                 backup_dir = f"/opt/services/_backup/{name}"
                 new_location["from"] = backup_dir
-                if not "before" in new_location["hooks"]:
+
-                    new_location["hooks"]["before"] = []
+                for hook_type in ["prevalidate", "before", "after", "failure", "success"]:
-                new_location["hooks"]["before"].append(f"/opt/services/backup/hooks/{name} '{backup_dir}'")
+                    hooks_add_or_create(
+                        new_location,
+                        hook_type,
+                        f"/opt/services/backup/hooks/{name} '{backup_dir}' {hook_type}"
+                    )
 
             if location["type"] == "directory":
                 new_location["from"] = location["path"]

playbooks/roles/backup/files/hooks/immich_database

@@ -2,5 +2,9 @@
 
 backup_path="$1"
 
+if [ "$2" != "before" ]; then
+	exit 0
+fi
+
 cd /opt/services/immich || exit
 docker compose exec database sh -c 'pg_dump -U "$DB_USERNAME" "$DB_DATABASE"' | gzip >"$backup_path/immich.sql.gz"

playbooks/roles/backup/files/hooks/immich_upload

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+backup_path="$1"
+stage="$2"
+
+if [ "$stage" == "before" ]; then
+	rclone mount --config /opt/services/backup/rclone.conf --daemon immich_upload: "$backup_path"
+fi
+
+if [ "$stage" == "after" ]; then
+	unmount "$backup_path"
+fi

playbooks/roles/backup/files/hooks/mailcowdockerized

@@ -2,4 +2,8 @@
 
 export MAILCOW_BACKUP_LOCATION="$1"
 
+if [ "$2" != "before" ]; then
+	exit 0
+fi
+
 /opt/mailcow-dockerized/helper-scripts/backup_and_restore.sh backup all --delete-days 1

playbooks/roles/backup/files/hooks/postgresql

@@ -2,6 +2,10 @@
 
 cd "$1"
 
+if [ "$2" != "before" ]; then
+	exit 0
+fi
+
 postgres_tables=$(sudo -u postgres psql -Atc "SELECT datname FROM pg_database WHERE datistemplate = false;")
 
 for i in $postgres_tables

playbooks/roles/backup/tasks/main.yml

@@ -25,6 +25,12 @@
         content: '{{ backup_yml_all | to_nice_yaml }}'
         mode: "0644"
 
+    - name: Create rclone.conf
+      ansible.builtin.copy:
+        dest: "{{ (service_path, 'rclone.conf') | path_join }}"
+        content: '{{ vault_backup.rclone }}'
+        mode: "0600"
+
     - name: Import tasks specific to the hooks scripts
       ansible.builtin.import_tasks: hooks.yml
     - name: Import tasks specific to the recovery scripts

playbooks/roles/software/tasks/main.yml

@@ -5,11 +5,12 @@
     update_cache: true
   become: true
 
-- name: Install jq and bzip2
+- name: Install wanted software
   ansible.builtin.apt:
     pkg:
       - jq
       - bzip2
+      - rclone
     state: present
     update_cache: true
   become: true

services.auto.tfvars

@@ -282,10 +282,10 @@ services = {
       domain = "gallery.serguzim.me"
     }]
     backup = [
-      #{
+      {
-      #  name = "immich_upload"
+        name = "immich_upload"
-      #  type = "docker_remote"
+        type = "hook"
-      #},
+      },
       {
         name = "immich_database"
         type = "hook"