From 849b4ab88740c5fd70af189618777f49cd54ca36 Mon Sep 17 00:00:00 2001
From: Timo Makinen <tmakinen@foo.sh>
Date: Sat, 22 Jun 2024 19:25:04 +0000
Subject: [PATCH] mariadb: Migrate to use backup_base

---
 roles/mariadb/files/mariadb-backup.sh |  3 ++-
 roles/mariadb/meta/main.yml           |  4 ++++
 roles/mariadb/tasks/main.yml          | 21 ---------------------
 3 files changed, 6 insertions(+), 22 deletions(-)
 create mode 100644 roles/mariadb/meta/main.yml

diff --git a/roles/mariadb/files/mariadb-backup.sh b/roles/mariadb/files/mariadb-backup.sh
index b2ac7cb..9a4a354 100755
--- a/roles/mariadb/files/mariadb-backup.sh
+++ b/roles/mariadb/files/mariadb-backup.sh
@@ -13,7 +13,8 @@ find . -xdev -mindepth 2 -maxdepth 2 -type f -mtime +30 \
 find . -xdev -depth -mindepth 1 -maxdepth 1 -type d -empty \
     -execdir rmdir -- {} \;
 
-mkdir "$DATE"
+mkdir -m 2770 "$DATE"
+chgrp backup "$DATE"
 
 for db in $(mysql -e "show databases" -s) ; do
     case "$db" in
diff --git a/roles/mariadb/meta/main.yml b/roles/mariadb/meta/main.yml
new file mode 100644
index 0000000..683bc95
--- /dev/null
+++ b/roles/mariadb/meta/main.yml
@@ -0,0 +1,4 @@
+---
+dependencies:
+  - {role: backup_base}
+
diff --git a/roles/mariadb/tasks/main.yml b/roles/mariadb/tasks/main.yml
index 00894d6..b2a9ca9 100644
--- a/roles/mariadb/tasks/main.yml
+++ b/roles/mariadb/tasks/main.yml
@@ -96,27 +96,6 @@
     group: "{{ ansible_wheel }}"
   when: mariadb_root_password is defined
 
-- name: Import sftpuser role
-  ansible.builtin.import_role:
-    name: sftpuser
-
-- name: Create backup directory
-  ansible.builtin.file:
-    path: /export/backup
-    state: directory
-    mode: "02750"
-    owner: root
-    group: backup
-
-- name: Link backup directory
-  ansible.builtin.file:
-    path: /srv/backup
-    src: /export/backup
-    state: link
-    owner: root
-    group: "{{ ansible_wheel }}"
-    follow: false
-
 - name: Copy backup script
   ansible.builtin.copy:
     dest: /usr/local/sbin/mariadb-backup