From 1319eaf7da583e1c0885fe95af58364ed7138776 Mon Sep 17 00:00:00 2001
From: Roman Pertl <roman@pertl.org>
Date: Tue, 29 Sep 2015 19:46:58 +0000
Subject: [PATCH] Revert "bugfix: remove anonymous accounts on all os, fix
 condition os_family for mysql root password"

This reverts commit 24f54ee98c9b96da7b92b70b79eb605ccd3ac659.
---
 mysql/server.sls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mysql/server.sls b/mysql/server.sls
index e67acf5..c3e082a 100644
--- a/mysql/server.sls
+++ b/mysql/server.sls
@@ -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: