Merge branch 'main' of https://gitea.verdnatura.es/verdnatura/vn-ansible

roles/db/defaults/main.yaml

@@ -32,7 +32,12 @@ required_files_and_mariabackup_files_and_root_scripts:
   - { src: "files/scripts/promote-slave.sh", dest: "/root/scripts/promote-slave.sh", mode: "u=rwx,g=rx,o=rx" }
   - { src: "files/scripts/README.md", dest: "/root/scripts/README.md", mode: "u=rw,g=r,o=r" }
   - { src: "files/scripts/scheduler-log.sh", dest: "/root/scripts/scheduler-log.sh", mode: "u=rwx,g=rx,o=rx" }
-  - { src: "files/marianrpe/95-mariadb.cfg", dest: "/etc/nagios/nrpe.d/95-mariadb.cfg", mode: "u=rw,g=r,o=r" }  
+  - { src: "files/marianrpe/95-mariadb.cfg", dest: "/etc/nagios/nrpe.d/95-mariadb.cfg", mode: "u=rw,g=r,o=r" }
+
+mariabackup_test_dev_files:
+  - { src: "mariabackuptest/apply.sql", dest: "/root/mariabackup/", mode: "u=rw,g=r,o=r" }
+  - { src: "mariabackuptest/bacula-after.sh", dest: "/root/mariabackup/", mode: "u=rwx,g=rx,o=rx" }
+
 downloads:
   - { url: "https://r.mariadb.com/downloads/mariadb_repo_setup", dest: "/tmp/mariadb_repo_setup", mode: "u=rwx,g=rx,o=rx" }
   - { url: "https://repo.percona.com/apt/percona-release_latest.generic_all.deb", dest: "/tmp/percona-release_latest.generic_all.deb", mode: "u=rw,g=r,o=r" }

roles/db/tasks/mariadb.yml

@@ -127,17 +127,6 @@
       group: root
       mode: u=rw,g=,o=
 
-  - name: Set MariaDB local configuration file for TestDB
-    copy:
-      src: "{{ item }}"
-      dest: /root/mariabackup/
-      owner: root
-      group: root
-      mode: u=rw,g=r,o=r
-    with_items:
-      - "mariabackuptest/apply.sql"
-      - "mariabackuptest/bacula-after.sh"
-  
   - name: Reminder to check mount points environment TestDB
     debug:
       msg: |
@@ -168,17 +157,6 @@
       group: root
       mode: u=rw,g=,o=
 
-  - name: Set MariaDB local configuration file for DevDB
-    copy:
-      src: "{{ item }}"
-      dest: /root/mariabackup/
-      owner: root
-      group: root
-      mode: u=rw,g=r,o=r
-    with_items:
-      - "mariabackupdev/apply.sql"
-      - "mariabackupdev/bacula-after.sh"
-  
   - name: Reminder to check mount points environment DevDB
     debug:
       msg: |
@@ -186,6 +164,18 @@
         - /mnt/mysqltmp
         Make sure they are correctly configured and accessible.
 
+- when: db.branch == 'dev' or db.branch == 'test'
+
+  block:  
+  - name: Set Mariabackup files for TestDB or DevDB
+    copy:
+      src: "{{ item.src }}"
+      dest: "{{ item.dest }}"
+      owner: root
+      group: root
+      mode: "{{ item.mode }}"
+    loop: "{{ mariabackup_test_dev_files }}"
+
 - name: Set Custom Configuration local template all Environment
   template:
     src: z99-local.cnf