saltstack-formulas/mysql-formula
1
0
Fork 0
mirror of https://github.com/saltstack-formulas/mysql-formula.git synced 2025-04-15 17:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "bugfix: remove anonymous accounts on all os, fix condition os_family for mysql root password"

Browse source 
This reverts commit 24f54ee98c.
This commit is contained in:
Roman Pertl 2015-09-29 19:46:58 +00:00
parent eac19e4e5f
commit 1319eaf7da
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mysql/server.sls
View file

@ -24,14 +24,13 @@ mysql_debconf:
- pkg: mysqld
- require:
- pkg: mysql_debconf_utils
{% elif os_family == 'RedHat' or os_family == 'Suse' or os_family == 'Arch' %}
{% elif os_family == 'RedHat' or 'Suse' %}
mysql_root_password:
cmd.run:
- name: mysqladmin --user {{ mysql_root_user }} password '{{ mysql_root_password|replace("'", "'\"'\"'") }}'
- unless: mysql --user {{ mysql_root_user }} --password='{{ mysql_root_password|replace("'", "'\"'\"'") }}' --execute="SELECT 1;"
- require:
- service: mysqld
{% endif %}
include:
- mysql.python
@ -56,6 +55,7 @@ mysql_delete_anonymous_user_{{ host }}:
{%- endif %}
{% endfor %}
{% endif %}
{% endif %}
# on arch linux: inital mysql datadirectory is not created
mysql_install_datadir: