1 files changed, 17 insertions, 22 deletions

diff --git a/roles/common-SQL/tasks/main.yml b/roles/common-SQL/tasks/main.yml
index 9064a68..7e59f60 100644
--- a/roles/common-SQL/tasks/main.yml
+++ b/roles/common-SQL/tasks/main.yml
@@ -1,67 +1,62 @@
-# XXX If #742046 gets fixed, we should preseed mysql-server to use
-# auth_socket as auth_plugin once the fix enters stable.
-- name: Install MySQL
-  apt: pkg={{ item }}
-  with_items:
-    # XXX: In non-interactive mode apt-get doesn't put a password on
-    # MySQL's root user; we fix that on the next task, but an intruder
-    # could exploit the race condition and for instance create dummy
-    # users.
-    - mysql-common
-    - mysql-server
-    - python-mysqldb
+- name: Install MariaDB
+  apt: pkg={{ packages }}
+  vars:
+    packages:
+    - mariadb-common
+    - mariadb-server
+    - python3-mysqldb
     # for the 'mysql_' munin plugin
     - libcache-cache-perl
 
-- name: Copy MySQL's configuration
-  copy: src=etc/mysql/my.cnf
-        dest=/etc/mysql/my.cnf
+- name: Copy MySQL/MariaDB configuration
+  copy: src=etc/mysql/mariadb.conf.d/99-user.cnf
+        dest=/etc/mysql/mariadb.conf.d/99-user.cnf
         owner=root group=root
         mode=0644
   register: r
   notify:
-    - Restart MySQL
+    - Restart MariaDB
 
 # We need to restart now and load the relevant authplugin before we
 # connect to the database.
 - meta: flush_handlers
 
 # XXX Dirty fix for #742046
 - name: Force root to use UNIX permissions
-  mysql_user2: name=root password= auth_plugin=auth_socket
-               state=present
+  mysql_user: name=root password="" plugin=unix_socket
+              state=present
 
 - name: Disallow anonymous and TCP/IP root login
-  mysql_user2: name={{ item.name|default('') }} host={{ item.host }}
-               state=absent
+  mysql_user: name={{ item.name|default('') }} host={{ item.host }}
+              state=absent
   with_items:
     - {             host: '{{ inventory_hostname_short }}' }
     - {             host: 'localhost' }
     - {             host: '127.0.0.1'}
     - {             host: '::1'}
     - { name: root, host: '{{ inventory_hostname_short }}' }
     - { name: root, host: '127.0.0.1'}
     - { name: root, host: '::1'}
 
-- name: Start MySQL
-  service: name=mysql state=started
+- name: Start MariaDB
+  service: name=mariadb state=started
 
 
 - name: Install 'mysql_' Munin wildcard plugin
   file: src=/usr/share/munin/plugins/mysql_
         dest=/etc/munin/plugins/mysql_{{ item }}
         owner=root group=root
         state=link force=yes
   with_items:
     # sudo /usr/share/munin/plugins/mysql_ suggest
     - bin_relay_log
     - commands
     - connections
     - files_tables
     - innodb_bpool
     - innodb_bpool_act
     - innodb_io
     - innodb_log
     - innodb_rows
     - innodb_semaphores
     - innodb_tnx