From eeadb037937ee1b5da6e084b98acb8f9c3242e2f Mon Sep 17 00:00:00 2001
From: Guilhem Moulin <guilhem@fripost.org>
Date: Tue, 11 Oct 2022 16:05:48 +0200
Subject: =?UTF-8?q?Remove=20module=20=E2=80=98mysql=5Fuser2=E2=80=99.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These days upstream's ‘mysql_user’ is good enough.
---
 roles/IMAP/tasks/spam.yml       |  4 ++--
 roles/bacula-dir/tasks/main.yml |  4 ++--
 roles/common-SQL/tasks/main.yml | 10 +++++-----
 roles/lists/tasks/sympa.yml     |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'roles')

diff --git a/roles/IMAP/tasks/spam.yml b/roles/IMAP/tasks/spam.yml
index c275b55..d70ccc9 100644
--- a/roles/IMAP/tasks/spam.yml
+++ b/roles/IMAP/tasks/spam.yml
@@ -63,8 +63,8 @@
 - name: Create a 'amavis' SQL user
   # This *must* be the user we run spamd as
   # See https://svn.apache.org/repos/asf/spamassassin/trunk/sql/README.bayes
-  mysql_user2: >
-      name=amavis password= auth_plugin=auth_socket
+  mysql_user: >
+      name=amavis password= plugin=auth_socket
       priv="spamassassin.awl:               SELECT,INSERT,UPDATE,DELETE
            /spamassassin.bayes_seen:        SELECT,INSERT,       DELETE
            /spamassassin.bayes_token:       SELECT,INSERT,UPDATE,DELETE
diff --git a/roles/bacula-dir/tasks/main.yml b/roles/bacula-dir/tasks/main.yml
index 2fdb35b..53d44ee 100644
--- a/roles/bacula-dir/tasks/main.yml
+++ b/roles/bacula-dir/tasks/main.yml
@@ -7,8 +7,8 @@
     - bacula-director-mysql
 
 - name: Create a 'bacula' SQL user
-  mysql_user2: name=bacula password= auth_plugin=unix_socket
-               state=present
+  mysql_user: name=bacula password= plugin=unix_socket
+              state=present
   notify:
     - Restart bacula-director
 
diff --git a/roles/common-SQL/tasks/main.yml b/roles/common-SQL/tasks/main.yml
index 927f567..7e59f60 100644
--- a/roles/common-SQL/tasks/main.yml
+++ b/roles/common-SQL/tasks/main.yml
@@ -4,7 +4,7 @@
     packages:
     - mariadb-common
     - mariadb-server
-    - python-mysqldb
+    - python3-mysqldb
     # for the 'mysql_' munin plugin
     - libcache-cache-perl
 
@@ -23,12 +23,12 @@
 
 # XXX Dirty fix for #742046
 - name: Force root to use UNIX permissions
-  mysql_user2: name=root password="" auth_plugin=unix_socket soname=auth_socket.so
-               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' }
diff --git a/roles/lists/tasks/sympa.yml b/roles/lists/tasks/sympa.yml
index 0d5eac1..27a5823 100644
--- a/roles/lists/tasks/sympa.yml
+++ b/roles/lists/tasks/sympa.yml
@@ -10,8 +10,8 @@
     - libcrypt-openssl-x509-perl
 
 - name: Make the 'sympa' MySQL user use unix_socket
-  mysql_user2: name=sympa password= auth_plugin=unix_socket
-               state=present
+  mysql_user: name=sympa password= plugin=unix_socket
+              state=present
 
 - name: Configure Sympa
   copy: src=etc/sympa/{{ item }}
-- 
cgit v1.2.3