diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2015-07-12 11:31:18 +0200 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2015-07-12 11:31:18 +0200 |
| commit | b752a80935941eb07e7700d8cbab567d1a3f39c4 (patch) | |
| tree | 3c3e907dc5445ec519bf8fc5daaf1ef12379eb69 | |
| parent | 99682f43e687552c0c536ed044afb7331d90a01d (diff) | |
Rename 'mysql_user' plugin to 'mysql_user2' to avoid name collisions.
| -rw-r--r-- | lib/modules/mysql_user2 (renamed from lib/modules/mysql_user) | 2 | ||||
| -rw-r--r-- | roles/IMAP/tasks/spam.yml | 2 | ||||
| -rw-r--r-- | roles/bacula-dir/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/common-SQL/tasks/main.yml | 8 | ||||
| -rw-r--r-- | roles/lists/tasks/sympa.yml | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/lib/modules/mysql_user b/lib/modules/mysql_user2 index 054698e..d10e3e0 100644 --- a/lib/modules/mysql_user +++ b/lib/modules/mysql_user2 @@ -20,7 +20,7 @@ DOCUMENTATION = ''' --- -module: mysql_user +module: mysql_user2 short_description: Adds or removes a user from a MySQL database. description: - Adds or removes a user from a MySQL database. diff --git a/roles/IMAP/tasks/spam.yml b/roles/IMAP/tasks/spam.yml index b8ac466..06624dd 100644 --- a/roles/IMAP/tasks/spam.yml +++ b/roles/IMAP/tasks/spam.yml @@ -50,7 +50,7 @@ - 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_user: > + mysql_user2: > name=amavis password= auth_plugin=auth_socket priv="spamassassin.awl: SELECT,INSERT,UPDATE,DELETE /spamassassin.bayes_seen: SELECT,INSERT, DELETE diff --git a/roles/bacula-dir/tasks/main.yml b/roles/bacula-dir/tasks/main.yml index 7bcf239..cee6fc2 100644 --- a/roles/bacula-dir/tasks/main.yml +++ b/roles/bacula-dir/tasks/main.yml @@ -82,8 +82,8 @@ - bacula-director-mysql - name: Create a 'bacula' SQL user - mysql_user: name=bacula password= auth_plugin=auth_socket - state=present + mysql_user2: name=bacula password= auth_plugin=auth_socket + state=present notify: - Restart bacula-director diff --git a/roles/common-SQL/tasks/main.yml b/roles/common-SQL/tasks/main.yml index 9541be8..9064a68 100644 --- a/roles/common-SQL/tasks/main.yml +++ b/roles/common-SQL/tasks/main.yml @@ -28,12 +28,12 @@ # XXX Dirty fix for #742046 - name: Force root to use UNIX permissions - mysql_user: name=root password= auth_plugin=auth_socket - state=present + mysql_user2: name=root password= auth_plugin=auth_socket + state=present - name: Disallow anonymous and TCP/IP root login - mysql_user: name={{ item.name|default('') }} host={{ item.host }} - state=absent + mysql_user2: 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 4505f54..00e5d9c 100644 --- a/roles/lists/tasks/sympa.yml +++ b/roles/lists/tasks/sympa.yml @@ -4,8 +4,8 @@ - sympa - name: Make the 'sympa' MySQL user use auth_socket - mysql_user: name=sympa password= auth_plugin=auth_socket - state=present + mysql_user2: name=sympa password= auth_plugin=auth_socket + state=present # XXX We want to change the retun-path for sendpasswd notices from # 'sympa-request@$robot' to 'noreply@fripost.org'. |