diff --git a/mysql/server.sls b/mysql/server.sls index fbda31b..e5761ed 100644 --- a/mysql/server.sls +++ b/mysql/server.sls @@ -24,13 +24,14 @@ mysql_debconf: - pkg: mysqld - require: - pkg: mysql_debconf_utils -{% elif os_family == 'RedHat' or 'Suse' %} +{% elif os_family == 'RedHat' or os_family == 'Suse' or os_family == 'Arch' %} mysql_root_password: cmd.run: - name: mysqladmin --user root password '{{ mysql_root_password|replace("'", "'\"'\"'") }}' - unless: mysql --user root --password='{{ mysql_root_password|replace("'", "'\"'\"'") }}' --execute="SELECT 1;" - require: - service: mysqld +{% endif %} include: - mysql.python @@ -55,7 +56,6 @@ mysql_delete_anonymous_user_{{ host }}: {%- endif %} {% endfor %} {% endif %} -{% endif %} mysqld: pkg.installed: