From 4874bc2bbdc22b237fb4989538bced8554aa8223 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Sun, 1 Dec 2019 13:34:18 +0100 Subject: [PATCH] Renamed global variable backups_databases_directory to backups_mysql_database_directory In order to specify and separate backups of different database services --- group_vars/all/vars.yml | 2 +- roles/common/tasks/main.yml | 2 +- roles/common/templates/backup_mysql_database.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml index bed85f0..63ec57c 100644 --- a/group_vars/all/vars.yml +++ b/group_vars/all/vars.yml @@ -13,7 +13,7 @@ update_scripts_directory: "/root/update" backup_gpg_fingerprint: "73D09948B2392D688A45DC8393E1BD26F6B02FB7" backups_directory: "/backups" -backups_databases_directory: "{{ backups_directory }}/databases" +backups_mysql_database_directory: "{{ backups_directory }}/databases" backups_files_directory: "{{ backups_directory }}/files" global_local_user: "{{ lookup('env', 'USER') }}" diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 0342db5..f7d198f 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -52,7 +52,7 @@ mode: "u=rwx,g=rx,o=rx" loop: - "{{ backups_directory }}" - - "{{ backups_databases_directory }}" + - "{{ backups_mysql_database_directory }}" - "{{ backups_files_directory }}" - name: Flush handlers for role diff --git a/roles/common/templates/backup_mysql_database.sh b/roles/common/templates/backup_mysql_database.sh index 7c477ad..ea02149 100644 --- a/roles/common/templates/backup_mysql_database.sh +++ b/roles/common/templates/backup_mysql_database.sh @@ -2,7 +2,7 @@ set -euxo pipefail; -file={{ backups_databases_directory | quote }}"/$1.sql.gpg"; +file={{ backups_mysql_database_directory | quote }}"/$1.sql.gpg"; mysqldump --opt --databases "$1" | pv --quiet --buffer-size 256M |