From 9d90cd640b1cd4947a8064847bdc222943ff1cf9 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Wed, 16 Nov 2022 12:28:16 +0100
Subject: [PATCH] deactivated mysql random root passwords

---
 roles/docker-gitea/templates/docker-compose.yml.j2     | 2 +-
 roles/docker-joomla/tasks/main.yml                     | 2 +-
 roles/docker-mailu/templates/docker-compose.yml.j2     | 2 +-
 roles/docker-mediawiki/tasks/main.yml                  | 2 +-
 roles/docker-mybb/tasks/main.yml                       | 1 -
 roles/docker-nextcloud/templates/docker-compose.yml.j2 | 2 +-
 roles/docker-yourls/templates/docker-compose.yml.j2    | 2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/roles/docker-gitea/templates/docker-compose.yml.j2 b/roles/docker-gitea/templates/docker-compose.yml.j2
index d0b25c04..8e218bff 100644
--- a/roles/docker-gitea/templates/docker-compose.yml.j2
+++ b/roles/docker-gitea/templates/docker-compose.yml.j2
@@ -40,7 +40,7 @@ services:
       MYSQL_DATABASE: "gitea"
       MYSQL_USER: "gitea"
       MYSQL_PASSWORD: "{{gitea_database_password}}"
-      MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
+      MYSQL_ROOT_PASSWORD: "{{gitea_database_password}}"
     volumes:
       - database:/var/lib/mysql
     healthcheck:
diff --git a/roles/docker-joomla/tasks/main.yml b/roles/docker-joomla/tasks/main.yml
index eaada19c..36cb3fc4 100644
--- a/roles/docker-joomla/tasks/main.yml
+++ b/roles/docker-joomla/tasks/main.yml
@@ -32,7 +32,7 @@
           MYSQL_DATABASE: "joomla"
           MYSQL_USER: "joomla"
           MYSQL_PASSWORD: "{{joomla_database_password}}"
-          MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
+          MYSQL_ROOT_PASSWORD: "{{joomla_database_password}}"
         volumes:
           - joomla-database:/var/lib/mysql
         restart: always
diff --git a/roles/docker-mailu/templates/docker-compose.yml.j2 b/roles/docker-mailu/templates/docker-compose.yml.j2
index e5e3f4d0..55939b88 100644
--- a/roles/docker-mailu/templates/docker-compose.yml.j2
+++ b/roles/docker-mailu/templates/docker-compose.yml.j2
@@ -23,7 +23,7 @@ services:
       MYSQL_DATABASE: "mailu"
       MYSQL_USER: "mailu"
       MYSQL_PASSWORD: "{{mailu_database_password}}"
-      MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
+      MYSQL_ROOT_PASSWORD: "{{mailu_database_password}}"
     volumes:
       - database:/var/lib/mysql
     healthcheck:
diff --git a/roles/docker-mediawiki/tasks/main.yml b/roles/docker-mediawiki/tasks/main.yml
index c5d68fb2..f6f32599 100644
--- a/roles/docker-mediawiki/tasks/main.yml
+++ b/roles/docker-mediawiki/tasks/main.yml
@@ -24,7 +24,7 @@
         image: mariadb
         environment:
           MYSQL_DATABASE: mediawiki
-          MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
+          MYSQL_ROOT_PASSWORD: "{{mediawiki_mysql_user_password}}"
           MYSQL_USER: mediawiki
           MYSQL_PASSWORD: "{{mediawiki_mysql_user_password}}"
         volumes:
diff --git a/roles/docker-mybb/tasks/main.yml b/roles/docker-mybb/tasks/main.yml
index 6fb827d3..f605570c 100644
--- a/roles/docker-mybb/tasks/main.yml
+++ b/roles/docker-mybb/tasks/main.yml
@@ -44,7 +44,6 @@
           MYSQL_DATABASE: "mybb"
           MYSQL_USER: "mybb"
           MYSQL_PASSWORD: "{{mybb_database_password}}"
-          MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
         volumes:
           - mybb-database:/var/lib/mysql
         restart: always
diff --git a/roles/docker-nextcloud/templates/docker-compose.yml.j2 b/roles/docker-nextcloud/templates/docker-compose.yml.j2
index 92beece5..52239c9c 100644
--- a/roles/docker-nextcloud/templates/docker-compose.yml.j2
+++ b/roles/docker-nextcloud/templates/docker-compose.yml.j2
@@ -24,7 +24,7 @@ services:
       MYSQL_DATABASE: "nextcloud"
       MYSQL_USER: "nextcloud"
       MYSQL_PASSWORD: "{{nextcloud_database_password}}"
-      MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
+      MYSQL_ROOT_PASSWORD: "{{nextcloud_database_password}}"
     volumes:
       - database:/var/lib/mysql
     restart: always
diff --git a/roles/docker-yourls/templates/docker-compose.yml.j2 b/roles/docker-yourls/templates/docker-compose.yml.j2
index 123d3d91..7cf86be2 100644
--- a/roles/docker-yourls/templates/docker-compose.yml.j2
+++ b/roles/docker-yourls/templates/docker-compose.yml.j2
@@ -29,7 +29,7 @@ services:
       MYSQL_DATABASE: "yourls"
       MYSQL_USER: "yourls"
       MYSQL_PASSWORD: "{{yourls_database_password}}"
-      MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
+      MYSQL_ROOT_PASSWORD: "{{yourls_database_password}}"
     volumes:
       - database:/var/lib/mysql
     healthcheck: