From 4d70766a41f97ab532d33f221b9a22febb73227e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavi=20Lle=C3=B3=20Tom=C3=A1s?= <xavi@verdnatura.es>
Date: Fri, 24 Jan 2025 14:49:49 +0100
Subject: [PATCH] refs #8414 - Refactor extract playbook variables and secrets
 everywhere in TV Screen

---
 roles/services/tasks/mariadb.yml              | 65 +++++--------------
 roles/services/templates/apply.cnf            |  5 --
 roles/services/templates/my.cnf               |  4 +-
 .../apply.config.sh}                          |  0
 4 files changed, 17 insertions(+), 57 deletions(-)
 delete mode 100644 roles/services/templates/apply.cnf
 rename roles/services/templates/{apply.config-test.sh => test-db/apply.config.sh} (100%)

diff --git a/roles/services/tasks/mariadb.yml b/roles/services/tasks/mariadb.yml
index e51815e..486d1c3 100644
--- a/roles/services/tasks/mariadb.yml
+++ b/roles/services/tasks/mariadb.yml
@@ -62,13 +62,13 @@
   command: mount -a
   when: fstab.changed
 
-- name: Set MariaDB Cron to /etc/cron.d
-  template:
-    src: templates/cron_mariadb
-    dest: /etc/cron.d/vn
-    owner: root
-    group: root
-    mode: u=rw,g=r,o=r
+# - name: Set MariaDB Cron to /etc/cron.d
+#   template:
+#     src: templates/cron_mariadb
+#     dest: /etc/cron.d/vn
+#     owner: root
+#     group: root
+#     mode: u=rw,g=r,o=r
 
 - name: Insert MySQL certificates
   copy:
@@ -80,14 +80,6 @@
   loop: "{{ certificates }}"
   notify: restart-mariadb
 
-- name: Configure MySQL master cert
-  copy:
-    content: "{{ lookup(passbolt, 'private_mysql', folder_parent_id=passbolt_folder).description }}"
-    dest: /etc/mysql/key.pem
-    owner: mysql
-    group: mysql
-    mode: u=rw,g=,o=
-
 - when: production is true
   block:
   - name: Set MariaDB custom configuration Production
@@ -125,41 +117,14 @@
       - "files/mariaconfigfiles/z92-testing.cnf"
     notify: restart-mariadb
 
-  # - name: Extracting passwords
-  #   no_log: true
-  #   set_fact:
-  #     jenkins_token: "{{ lookup(passbolt, jenkins_user_name, folder_parent_id=passbolt_folder).password }}"
-
-  # - name: Debug variable
-  #   debug:
-  #     msg: "{{ jenkins_token }}"
-
-  - name: Set MariaBackup custom configuration Test
-    template:
-      src: "apply.config-test.sh"
-      dest: /root/mariabackup/apply.config.sh
-      owner: root
-      group: root
-      mode: u=rw,g=r,o=r
+  # - name: Set MariaBackup custom configuration Test
+  #   template:
+  #     src: "apply.config-test.sh"
+  #     dest: /root/mariabackup/apply.config.sh
+  #     owner: root
+  #     group: root
+  #     mode: u=rw,g=r,o=r
   
-  - name: Extracting dbusername
-    set_fact:
-      dbusername: "{{ lookup(passbolt, dbuser, folder_parent_id=passbolt_folder).username }}"
-  
-  - name: Extracting dbpassword
-    no_log: true
-    set_fact:
-      dbpass: "{{ lookup(passbolt, dbuser, folder_parent_id=passbolt_folder).password }}"
-  
-  - name: Extracting MariaBackup UserName
-    set_fact:
-      mariabackupusernametpl: "{{ lookup(passbolt, mariabackupusername, folder_parent_id=passbolt_folder).username }}"
-
-  - name: Extracting MariaBackup Password
-    no_log: true
-    set_fact:
-      mariabackuppasstpl: "{{ lookup(passbolt, mariabackupusername, folder_parent_id=passbolt_folder).password }}"
-
   - name: Set MariaBackup custom template configuration Test
     template:
       src: "{{ item }}"
@@ -168,7 +133,7 @@
       group: root
       mode: u=rw,g=,o=
     with_items:
-      - "apply.cnf"
+      - "test-db/apply.config.sh"
       - "my.cnf"
 
   - name: Set MariaDB local configuration file
diff --git a/roles/services/templates/apply.cnf b/roles/services/templates/apply.cnf
deleted file mode 100644
index 0e4ce4f..0000000
--- a/roles/services/templates/apply.cnf
+++ /dev/null
@@ -1,5 +0,0 @@
-[client]
-host     = localhost
-user     = {{ dbusername }}
-password = {{ dbpass }}
-socket   = /var/run/mysqld/mysqld.sock
diff --git a/roles/services/templates/my.cnf b/roles/services/templates/my.cnf
index 12effdb..b1b4ac9 100644
--- a/roles/services/templates/my.cnf
+++ b/roles/services/templates/my.cnf
@@ -1,7 +1,7 @@
 [mariabackup]
 host = localhost
-user = {{ mariabackupusernametpl }}
-password = {{ mariabackuppasstpl }}
+user = mariabackup
+password = {{ lookup(passbolt, 'mariabackup', folder_parent_id=passbolt_folder).password }}
 use-memory = 1G
 parallel = 2
 stream = mbstream
diff --git a/roles/services/templates/apply.config-test.sh b/roles/services/templates/test-db/apply.config.sh
similarity index 100%
rename from roles/services/templates/apply.config-test.sh
rename to roles/services/templates/test-db/apply.config.sh