testing

roles/webserver/handlers/main.yml

@@ -23,8 +23,9 @@
   listen: composeup_webserver
 
 - name: Check Nextcloud status
-  ansible.builtin.command: "docker exec --user www-data {{ webserver_root | basename }}_nextcloud_1
-            php occ status"
+  ansible.builtin.command:
+    "docker exec --user www-data {{ webserver_root | basename }}_nextcloud_1
+    php occ status"
   listen: composeup_webserver
   register: nextcloud_status
 

roles/webserver/tasks/debian.yml

@@ -0,0 +1,48 @@
+- name: Install MariaDB Server
+  ansible.builtin.apt:
+    name: mariadb-server
+    state: present
+
+- name: Change the bind-address to allow Docker
+  ansible.builtin.lineinfile:
+    path: /etc/mysql/mariadb.conf.d/50-server.cnf
+    regex: "^bind-address"
+    line: "bind-address            = 0.0.0.0"
+  notify: restart_mariadb
+
+- name: Install MySQL Support for Python 3
+  ansible.builtin.apt:
+    name: python3-pymysql
+    state: present
+
+- name: Create MariaDB databases
+  community.mysql.mysql_db:
+    name: "{{ item.name }}"
+    state: present
+    login_unix_socket: /var/run/mysqld/mysqld.sock
+  loop: "{{ databases }}"
+  no_log: true
+
+- name: Create MariaDB users
+  community.mysql.mysql_user:
+    name: "{{ item.name }}"
+    password: "{{ item.pass }}"
+    host: "%"
+    state: present
+    priv: "{{ item.name }}.*:ALL"
+    login_unix_socket: /var/run/mysqld/mysqld.sock
+  loop: "{{ databases }}"
+  no_log: true
+
+- name: Create webserver docker-compose directory
+  ansible.builtin.file:
+    path: "{{ webserver_root }}"
+    state: directory
+    mode: "600"
+
+- name: Install webserver docker-compose.yml
+  ansible.builtin.copy:
+    src: docker-compose.yml
+    dest: "{{ webserver_root }}/docker-compose.yml"
+    mode: "600"
+  notify: composeup_webserver

roles/webserver/tasks/main.yml

@@ -1,57 +1,16 @@
-- name: Install MariaDB Server
-  ansible.builtin.apt:
-    name: mariadb-server
-    state: present
+- name: Include Debian-specific tasks
+  ansible.builtin.include_tasks: debian.yml
+  when: ansible_os_family == "Debian"
 
-- name: Change the bind-address to allow Docker
-  ansible.builtin.lineinfile:
-    path: /etc/mysql/mariadb.conf.d/50-server.cnf
-    regex: "^bind-address"
-    line: "bind-address            = 0.0.0.0"
-  notify: restart_mariadb
-
-- name: Install MySQL Support for Python 3
-  ansible.builtin.apt:
-    name: python3-pymysql
-    state: present
-
-- name: Create MariaDB databases
-  community.mysql.mysql_db:
-    name: "{{ item.name }}"
-    state: present
-    login_unix_socket: /var/run/mysqld/mysqld.sock
-  loop: "{{ databases }}"
-  no_log: "{{ item.pass is defined }}"
-
-- name: Create MariaDB users
-  community.mysql.mysql_user:
-    name: "{{ item.name }}"
-    password: "{{ item.pass }}"
-    host: '%'
-    state: present
-    priv: "{{ item.name }}.*:ALL"
-    login_unix_socket: /var/run/mysqld/mysqld.sock
-  loop: "{{ databases }}"
-  no_log: "{{ item.pass is defined }}"
-
-- name: Create webserver docker-compose directory
-  ansible.builtin.file:
-    path: "{{ webserver_root }}"
-    state: directory
-    mode: 0600
-
-- name: Install webserver docker-compose.yml
-  ansible.builtin.copy:
-    src: docker-compose.yml
-    dest: "{{ webserver_root }}/docker-compose.yml"
-    mode: 0600
-  notify: composeup_webserver
+- name: Include Rocky Linux-specific tasks
+  ansible.builtin.include_tasks: rocky.yml
+  when: ansible_os_family == "RedHat"
 
 - name: Install docker-compose .env
   ansible.builtin.template:
     src: compose-env.j2
     dest: "{{ webserver_root }}/.env"
-    mode: 0600
+    mode: "600"
   notify: composeup_webserver
 
 - name: Allow MariaDB database connections

roles/webserver/tasks/rocky.yml

@@ -0,0 +1,58 @@
+- name: Install MariaDB Server
+  ansible.builtin.dnf:
+    name: mariadb-server
+    state: present
+
+- name: Change the bind-address to allow Docker
+  ansible.builtin.lineinfile:
+    path: /etc/my.cnf.d/mariadb-server.cnf
+    regex: "^bind-address"
+    line: "bind-address            = 0.0.0.0"
+  notify: restart_mariadb
+
+- name: Start and enable MariaDB service
+  ansible.builtin.systemd:
+    name: mariadb
+    state: started
+    enabled: yes
+
+- name: Install MySQL Support for Python 3
+  ansible.builtin.dnf:
+    name: python3-PyMySQL
+    state: present
+
+- name: Create MariaDB databases
+  community.mysql.mysql_db:
+    name: "{{ item.name }}"
+    state: present
+    login_unix_socket: /var/lib/mysql/mysql.sock
+  loop: "{{ databases }}"
+  # no_log: true
+
+- name: Create MariaDB users
+  community.mysql.mysql_user:
+    name: "{{ item.name }}"
+    password: "{{ item.pass }}"
+    host: "%"
+    state: present
+    priv: "{{ item.name }}.*:ALL"
+    login_unix_socket: /var/lib/mysql/mysql.sock
+  loop: "{{ databases }}"
+  # no_log: true
+
+- name: Create webserver docker-compose directory
+  ansible.builtin.file:
+    path: /home/oci/webserver
+    state: directory
+    mode: "600"
+    owner: oci
+    group: oci
+
+- name: Install webserver docker-compose.yml
+  ansible.builtin.copy:
+    src: docker-compose.yml
+    dest: /home/oci/webserver/compose.yml
+    mode: "600"
+    owner: oci
+    group: oci
+  notify: composeup_webserver