From c5b3c1244963fdf0aa316bf72da9794b53e99b26 Mon Sep 17 00:00:00 2001
From: owine <owine@users.noreply.github.com>
Date: Wed, 3 May 2023 18:35:35 -0500
Subject: [PATCH] Create DBs are DB user, not root

---
 roles/docspell/tasks/main.yml       | 2 +-
 roles/invoiceninjav5/tasks/main.yml | 2 +-
 roles/koel/tasks/main.yml           | 8 ++++----
 roles/nextcloud/tasks/main.yml      | 2 +-
 roles/plexshare/tasks/main.yml      | 4 ++--
 roles/teamspeak/tasks/main.yml      | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/roles/docspell/tasks/main.yml b/roles/docspell/tasks/main.yml
index db027c675e..2b8b9dfe70 100644
--- a/roles/docspell/tasks/main.yml
+++ b/roles/docspell/tasks/main.yml
@@ -25,7 +25,7 @@
   community.mysql.mysql_db:
     name: "{{ docspell_name }}"
     login_host: "{{ docspell_name }}_mariadb"
-    login_user: "root"
+    login_user: "{{ mariadb_docker_env_user }}"
     login_password: "{{ mariadb_docker_env_password }}"
     state: present
 
diff --git a/roles/invoiceninjav5/tasks/main.yml b/roles/invoiceninjav5/tasks/main.yml
index 5d60d2f072..0819acb450 100644
--- a/roles/invoiceninjav5/tasks/main.yml
+++ b/roles/invoiceninjav5/tasks/main.yml
@@ -21,7 +21,7 @@
   community.mysql.mysql_db:
     name: "{{ invoiceninjav5_name }}"
     login_host: "{{ invoiceninjav5_name }}_mariadb"
-    login_user: "root"
+    login_user: "{{ mariadb_docker_env_user }}"
     login_password: "{{ mariadb_docker_env_password }}"
     state: present
 
diff --git a/roles/koel/tasks/main.yml b/roles/koel/tasks/main.yml
index fd6bbaf067..c9804477a4 100644
--- a/roles/koel/tasks/main.yml
+++ b/roles/koel/tasks/main.yml
@@ -22,9 +22,9 @@
 
 - name: MariaDB | Create koel database
   community.mysql.mysql_db:
-    name: "koel"
+    name: "{{ koel_name }}"
     login_host: "{{ koel_name }}_mariadb"
-    login_user: "root"
+    login_user: "{{ mariadb_docker_env_user }}"
     login_password: "{{ mariadb_docker_env_password }}"
     state: present
 
@@ -91,9 +91,9 @@
 
 - name: Edit Admin user
   community.mysql.mysql_query:
-    login_db: "koel"
+    login_db: "{{ koel_name }}"
     login_host: "{{ koel_name }}_mariadb"
-    login_user: "root"
+    login_user: "{{ mariadb_docker_env_user }}"
     login_password: "{{ mariadb_docker_env_password }}"
     query: 'UPDATE `users` SET `id` = "1", `name` = "{{ user.name }}", `email` = "{{ user.email }}", `password` = "{{ koel_admin_password_hash.stdout }}", `is_admin` = "1", `preferences` = NULL, `remember_token` = NULL, `created_at` = "{{ koel_date.stdout }}", `updated_at` = "{{ koel_date.stdout }}" WHERE ((`id` = "1"));'
   when: not stat_koel_db_folder.stat.exists
diff --git a/roles/nextcloud/tasks/main.yml b/roles/nextcloud/tasks/main.yml
index 1906b74450..133fe1d9e2 100644
--- a/roles/nextcloud/tasks/main.yml
+++ b/roles/nextcloud/tasks/main.yml
@@ -20,7 +20,7 @@
   community.mysql.mysql_db:
     name: "{{ nextcloud_name }}"
     login_host: "{{ nextcloud_name }}_mariadb"
-    login_user: "root"
+    login_user: "{{ mariadb_docker_env_user }}"
     login_password: "{{ mariadb_docker_env_password }}"
     state: present
 
diff --git a/roles/plexshare/tasks/main.yml b/roles/plexshare/tasks/main.yml
index 711bf0d9f0..678e921964 100644
--- a/roles/plexshare/tasks/main.yml
+++ b/roles/plexshare/tasks/main.yml
@@ -24,9 +24,9 @@
 
 - name: MariaDB | Create plexshare database
   community.mysql.mysql_db:
-    name: "plexshare"
+    name: "{{ plexshare_name }}"
     login_host: "{{ plexshare_name }}_mariadb"
-    login_user: "root"
+    login_user: "{{ mariadb_docker_env_user }}"
     login_password: "{{ mariadb_docker_env_password }}"
     state: present
   when: not stat_plexshare_db_folder.stat.exists
diff --git a/roles/teamspeak/tasks/main.yml b/roles/teamspeak/tasks/main.yml
index f9e6980b77..4b82f5f20b 100644
--- a/roles/teamspeak/tasks/main.yml
+++ b/roles/teamspeak/tasks/main.yml
@@ -23,7 +23,7 @@
   community.mysql.mysql_db:
     name: "{{ teamspeak_name }}"
     login_host: "{{ teamspeak_name }}_mariadb"
-    login_user: "root"
+    login_user: "{{ mariadb_docker_env_user }}"
     login_password: "{{ mariadb_docker_env_password }}"
     state: present