Modify garb/mariadb tasks for FreeBSD compatibility

Author: medanthelinium

tasks/config_db.yaml

@@ -1,30 +1,30 @@
 ---
-- name: Handle MariaDB nodes
-  when: not mariadb.galera.arbitrator
+- name: Configure MariaDB (FreeBSD)
+  when: ansible_system == 'FreeBSD'
   block:
-    - name: Configure MariaDB (FreeBSD)
-      when: ansible_system == 'FreeBSD'
-      block:
-        - name: Get MariaDB server version
-          check_mode: no
-          ansible.builtin.shell:
-            cmd: >-
-              /usr/local/libexec/mysqld --version |
-              python3 -c
-              'import sys, re; print(re.search("Ver[\s\t]*([0-9]+\.[0-9]+)", sys.stdin.readline()).group(1))'
-          changed_when: no
-          register: mariadb_get_server_version_result
+    - name: Get MariaDB server version
+      check_mode: no
+      ansible.builtin.shell:
+        cmd: >-
+          /usr/local/libexec/mysqld --version |
+          python3 -c
+          'import sys, re; print(re.search("Ver[\s\t]*([0-9]+\.[0-9]+)", sys.stdin.readline()).group(1))'
+      changed_when: no
+      register: mariadb_get_server_version_result
 
-        - name: Check if legacy config location must be used
-          ansible.builtin.set_fact:
-            mariadb_use_legacy_config_location_result: "{{ mariadb_get_server_version_result.stdout is version('10.5', '<') }}"
+    - name: Check if legacy config location must be used
+      ansible.builtin.set_fact:
+        mariadb_use_legacy_config_location_result: "{{ mariadb_get_server_version_result.stdout is version('10.5', '<') }}"
 
-        - name: Remove obsolete my.cnf
-          when: not mariadb_use_legacy_config_location_result
-          ansible.builtin.file:
-            path: "/usr/local/etc/my.cnf"
-            state: absent
+    - name: Remove obsolete my.cnf
+      when: not mariadb_use_legacy_config_location_result
+      ansible.builtin.file:
+        path: "/usr/local/etc/my.cnf"
+        state: absent
 
+- name: Handle MariaDB nodes
+  when: not mariadb.galera.arbitrator
+  block:
     - name: Configure MariaDB (my.cnf)
       community.general.ini_file:
         path: "{{ config_filepath }}"

tasks/galera.yaml

@@ -58,6 +58,8 @@
       ansible.builtin.template:
         src: bin/galera_new_cluster
         dest: /var/opt/galera/bin/galera_new_cluster
+        owner: root
+        mode: "0755"
 
     - name: Initialize cluster
       changed_when: yes