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

Fix setting datadir to alternate dir with mariadb

Browse source
This commit is contained in:
Sander Cornelissen 2016-12-19 17:00:59 +01:00
parent 75277fec87
commit 786bde93fe
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
mysql/server.sls
View file

@ -89,7 +89,7 @@ mysqld-packages:
- debconf: mysql_debconf
{% endif %}
{% if os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 %}
{% if os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.server == 'mysql-server' %}
# Initialize mysql database with --initialize-insecure option before starting service so we don't get locked out.
mysql_initialize:
cmd.run:
@ -100,6 +100,18 @@ mysql_initialize:
- pkg: {{ mysql.server }}
{% endif %}
{% if os_family in ['RedHat', 'Suse'] and mysql.server == 'mariadb-server' %}
# For MariaDB it's enough to only create the datadir
mysql_initialize:
file.directory:
- name: {{ mysql_datadir }}
- user: mysql
- group: mysql
- makedirs: True
- require:
- pkg: {{ mysql.server }}
{% endif %}
{% if os_family in ['Gentoo'] %}
mysql_initialize:
cmd.run:
@ -116,8 +128,10 @@ mysqld:
- enable: True
- require:
- pkg: {{ mysql.server }}
{% if (os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7) or (os_family in ['Gentoo']) %}
{% if (os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.server == 'mysql-server') or (os_family in ['Gentoo']) %}
- cmd: mysql_initialize
{% elif os_family in ['RedHat', 'Suse'] and mysql.server == 'mariadb-server' %}
- file: {{ mysql_datadir }}
{% endif %}
- watch:
- pkg: {{ mysql.server }}