From 0a9658be3f115f8abcff411d5d2375b81183ae14 Mon Sep 17 00:00:00 2001
From: Christoph Haas <email@christoph-haas.de>
Date: Thu, 15 Aug 2019 18:04:05 +0200
Subject: [PATCH] DB user creation works. DB creation does not

---
 ansible/roles/ispmail-database/tasks/main.yml      | 27 ++++++++++++++--------
 .../ispmail-database/templates/root-my-cnf.j2      |  1 +
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/ansible/roles/ispmail-database/tasks/main.yml b/ansible/roles/ispmail-database/tasks/main.yml
index e5d2c02..c536062 100644
--- a/ansible/roles/ispmail-database/tasks/main.yml
+++ b/ansible/roles/ispmail-database/tasks/main.yml
@@ -1,20 +1,29 @@
 ---
 - name: Installing required Python mysqldb module for Ansible to manage databases
   apt: name=python-pymysql
-- name: Ensure mysql root password is updated for all root accounts
+
+- name: Set root user password
+  become: true
+  # If .my.cnf already exists, this will cause an mysql-root-password update.
   mysql_user:
     name: root
-    host: localhost
+    password: "{{ ispmail_mysql_root_password}}"
     login_unix_socket: /var/run/mysqld/mysqld.sock
-    password: "{{ ispmail_mysql_root_password }}"
-    priv: '*.*:ALL,GRANT'
     check_implicit_admin: true
-  #become: yes
-  #notify: Restart MySQL
-- name: Creating my-cnf for root user
-  template: src=root-my-cnf.j2 dest=/root/.my.cnf mode=0600
+
+- name: Create .my.cnf
+  template:
+   src: "root-my-cnf.j2"
+   dest: "/root/.my.cnf"
+   owner: root
+   group: root
+   mode: 0600
+
 - name: creating mailserver MySQL database
-  mysql_db: name=mailserver login_password="{{ ispmail_mysql_root_password }}"
+  #become: true
+  mysql_db:
+    name: mailserver
+
 - name: creating Roundcube MySQL database
   mysql_db: name=roundcube
 - name: copying MySQL database schema to server
diff --git a/ansible/roles/ispmail-database/templates/root-my-cnf.j2 b/ansible/roles/ispmail-database/templates/root-my-cnf.j2
index 0615332..c1f9c78 100644
--- a/ansible/roles/ispmail-database/templates/root-my-cnf.j2
+++ b/ansible/roles/ispmail-database/templates/root-my-cnf.j2
@@ -1,2 +1,3 @@
 [client]
+user=root
 password={{ispmail_mysql_root_password}}