Merge pull request #263 from bawuenet/master

refactor(jinja): improve indentation

mysql/server.sls

@@ -14,31 +14,32 @@ include:
 {%- set mysql_datadir = salt['pillar.get']('mysql:server:mysqld:datadir', '/var/lib/mysql') %}
 {%- set mysql_unix_socket = salt['pillar.get']('mysql:server:unix_socket', '') %}
 {%- set lsb_distrib_codename = salt['grains.get']('lsb_distrib_codename', None) %}
+
 {%- if mysql_root_password %}
 {%-   if os_family == 'Debian' %}
 
-{%   if 'debconf_root_password' in mysql %}
-{%     set debconf_root_password = mysql.debconf_root_password %}
-{%     set debconf_root_password_again = mysql.debconf_root_password_again %}
-{%   elif mysql.serverpkg.startswith('percona-server-server') %}
-{%     if mysql.serverpkg < 'percona-server-server-5.7' %}{# 5.5 and 5.6 uses the same name... #}
-{%       set debconf_root_password = 'percona-server-server/root_password' %}
-{%       set debconf_root_password_again = 'percona-server-server/root_password_again' %}
-{%     elif '5.7' in mysql.serverpkg %}{# 5.7 changed option name... #}
-{%       set debconf_root_password = 'percona-server-server-5.7/root-pass' %}
-{%       set debconf_root_password_again = 'percona-server-server-5.7/re-root-pass' %}
-{%     else %}{# attempt to support future version? #}
-{%       set debconf_root_password = mysql.serverpkg + '/root-pass' %}
-{%       set debconf_root_password_again = mysql.serverpkg + '/re-root-pass' %}
-{%     endif %}
-{%   else %}
-{%     if salt['grains.get']('osmajorrelease')|int < 9 or not salt['grains.get']('os')|lower == 'debian' %}
-{%       set debconf_root_password = 'mysql-server/root_password' %}
-{%       set debconf_root_password_again = 'mysql-server/root_password_again' %}
-{%     else %}
-{%       set debconf_root_password = False %}
-{%     endif %}
-{%   endif %}
+{%-     if 'debconf_root_password' in mysql %}
+{%-       set debconf_root_password = mysql.debconf_root_password %}
+{%-       set debconf_root_password_again = mysql.debconf_root_password_again %}
+{%-     elif mysql.serverpkg.startswith('percona-server-server') %}
+{%-       if mysql.serverpkg < 'percona-server-server-5.7' %}{# 5.5 and 5.6 uses the same name... #}
+{%-         set debconf_root_password = 'percona-server-server/root_password' %}
+{%-         set debconf_root_password_again = 'percona-server-server/root_password_again' %}
+{%-       elif '5.7' in mysql.serverpkg %}{# 5.7 changed option name... #}
+{%-         set debconf_root_password = 'percona-server-server-5.7/root-pass' %}
+{%-         set debconf_root_password_again = 'percona-server-server-5.7/re-root-pass' %}
+{%-       else %}{# attempt to support future version? #}
+{%-         set debconf_root_password = mysql.serverpkg + '/root-pass' %}
+{%-         set debconf_root_password_again = mysql.serverpkg + '/re-root-pass' %}
+{%-       endif %}
+{%-     else %}
+{%-       if salt['grains.get']('osmajorrelease')|int < 9 or not salt['grains.get']('os')|lower == 'debian' %}
+{%-         set debconf_root_password = 'mysql-server/root_password' %}
+{%-         set debconf_root_password_again = 'mysql-server/root_password_again' %}
+{%-       else %}
+{%-         set debconf_root_password = False %}
+{%-       endif %}
+{%-     endif %}
 
 {%    if mysql.serverpkg == 'mysql-community-server' %}
 mysql-community-server_repo:
@@ -162,7 +163,8 @@ mysqld-packages:
       - file: mysql_config_directory
 {%- endif %}
 
-{%- if os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg.lower() != 'mariadb-server' %}
+{%- if os_family in ['RedHat', 'Suse'] and mysql.version is defined
+      and mysql.version >= 5.7 and mysql.serverpkg.lower() != 'mariadb-server' %}
 # Initialize mysql database with --initialize-insecure option before starting service so we don't get locked out.
 mysql_initialize:
   cmd.run:
@@ -217,7 +219,9 @@ mysqld-service-running:
     - enable: True
     - require:
       - pkg: {{ mysql.serverpkg }}
-{%- if (os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg.lower() != 'mariadb-server') or (os_family in ['Gentoo', 'FreeBSD']) %}
+{%- if (os_family in ['RedHat', 'Suse'] and mysql.version is defined
+      and mysql.version >= 5.7 and mysql.serverpkg.lower() != 'mariadb-server')
+      or (os_family in ['Gentoo', 'FreeBSD']) %}
       - cmd: mysql_initialize
 {%- elif os_family in ['RedHat', 'Suse'] and mysql.serverpkg.lower() == 'mariadb-server' %}
       - file: {{ mysql_datadir }}