From ba1979fde0191b9b676af4c845790566aaba4519 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Mon, 28 Sep 2020 20:00:07 +0200
Subject: [PATCH] Update to 2020-09-28 20:00

---
 roles/glpi/tasks/cleanup.yml        | 11 +++++++----
 roles/glpi/tasks/directories.yml    |  2 +-
 roles/glpi/tasks/install.yml        | 10 ++++------
 roles/glpi/templates/post_backup.j2 |  3 +++
 roles/glpi/templates/pre_backup.j2  |  9 +++++++++
 5 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 roles/glpi/templates/post_backup.j2
 create mode 100644 roles/glpi/templates/pre_backup.j2

diff --git a/roles/glpi/tasks/cleanup.yml b/roles/glpi/tasks/cleanup.yml
index f3f82ff..bfa9821 100644
--- a/roles/glpi/tasks/cleanup.yml
+++ b/roles/glpi/tasks/cleanup.yml
@@ -9,10 +9,13 @@
   tags: glpi
 
 - name: Remove temp files
-  file: path={{ glpi_root_dir }}/tmp/{{ item }} state=absent
+  file: path={{ item }} state=absent
   with_items:
-    - glpi
-    - glpi-{{ glpi_version }}.tgz
-    - glpi.sql
+    - "{{ glpi_root_dir }}/tmp/glpi"
+    - "{{ glpi_root_dir }}/tmp/glpi-{{ glpi_version }}.tgz"
+    - "{{ glpi_root_dir }}/tmp/glpi.sql"
+    - "{{ glpi_root_dir }}/db_dumps"
+    - /etc/backup/pre.d/glpi_{{ glpi_id }}_dump_db
+    - /etc/backup/post.d/glpi_{{ glpi_id }}_rm_dump
   tags: glpi
 
diff --git a/roles/glpi/tasks/directories.yml b/roles/glpi/tasks/directories.yml
index 79bb494..ddd6b66 100644
--- a/roles/glpi/tasks/directories.yml
+++ b/roles/glpi/tasks/directories.yml
@@ -8,7 +8,7 @@
     - "{{ glpi_root_dir }}/tmp"
     - "{{ glpi_root_dir }}/sessions"
     - "{{ glpi_root_dir }}/meta"
-    - "{{ glpi_root_dir }}/db_dumps"
+    - "{{ glpi_root_dir }}/backup"
     - "{{ glpi_root_dir }}/data"
     - "{{ glpi_root_dir }}/data/_files"
     - "{{ glpi_root_dir }}/data/_cache"
diff --git a/roles/glpi/tasks/install.yml b/roles/glpi/tasks/install.yml
index 57e4a55..a62862e 100644
--- a/roles/glpi/tasks/install.yml
+++ b/roles/glpi/tasks/install.yml
@@ -122,12 +122,10 @@
   tags: glpi
 
 - name: Deploy backup scripts
-  template: src={{ item.script }}.j2 dest=/etc/backup/{{ item.type }}.d/glpi_{{ glpi_id }}_{{ item.script }} mode=750
-  with_items:
-    - script: dump_db
-      type: pre
-    - script: rm_dump
-      type: post
+  template: src={{ item }}_backup.j2 dest=/etc/backup/{{ item }}.d/glpi_{{ glpi_id }} mode=750
+  loop:
+    - pre
+    - post
   tags: glpi
 
 - name: Download the logo
diff --git a/roles/glpi/templates/post_backup.j2 b/roles/glpi/templates/post_backup.j2
new file mode 100644
index 0000000..85a23f0
--- /dev/null
+++ b/roles/glpi/templates/post_backup.j2
@@ -0,0 +1,3 @@
+#!/bin/bash -e
+
+rm -f {{ glpi_root_dir }}/backup/*
diff --git a/roles/glpi/templates/pre_backup.j2 b/roles/glpi/templates/pre_backup.j2
new file mode 100644
index 0000000..1e55f8c
--- /dev/null
+++ b/roles/glpi/templates/pre_backup.j2
@@ -0,0 +1,9 @@
+#!/bin/bash -e
+
+/usr/bin/mysqldump --user={{ glpi_mysql_user | quote }} \
+                   --password={{ glpi_mysql_pass | quote }} \
+                   --host={{ glpi_mysql_server | quote }} \
+                   --quick --single-transaction \
+                   --add-drop-table {{ glpi_mysql_db | quote }} | zstd -T0 -c > {{ glpi_root_dir }}/backup/{{ glpi_mysql_db }}.sql.zst
+
+cp {{ glpi_root_dir }}/web/config/glpicrypt.key {{ glpi_root_dir }}/backup/