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

Merge pull request #193 from w3w/master

Browse source 
Fixed mysql.server for new map file
This commit is contained in:
N 2018-07-10 15:00:30 +01:00 • committed by GitHub
commit 5274140ab6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
mysql/server.sls
View file

@ -21,9 +21,9 @@ mysql_debconf_utils:
mysql_debconf:
debconf.set:
- name: {{ mysql.server }}
- name: {{ mysql.serverpkg }}
- data:
'{{ mysql.server }}/start_on_boot': {'type': 'boolean', 'value': 'true'}
'{{ mysql.serverpkg }}/start_on_boot': {'type': 'boolean', 'value': 'true'}
- require_in:
- pkg: {{ mysql.serverpkg }}
- require:
@ -105,7 +105,7 @@ mysqld-packages:
- require_in:
- file: mysql_config
{% if os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.server != 'mariadb-server' %}
{% if os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg != 'mariadb-server' %}
# Initialize mysql database with --initialize-insecure option before starting service so we don't get locked out.
mysql_initialize:
cmd.run:
@ -116,7 +116,7 @@ mysql_initialize:
- pkg: {{ mysql.serverpkg }}
{% endif %}
{% if os_family in ['RedHat', 'Suse'] and mysql.server == 'mariadb-server' %}
{% if os_family in ['RedHat', 'Suse'] and mysql.serverpkg == 'mariadb-server' %}
# For MariaDB it's enough to only create the datadir
mysql_initialize:
file.directory:
@ -131,7 +131,7 @@ mysql_initialize:
{% if os_family in ['Gentoo'] %}
mysql_initialize:
cmd.run:
- name: emerge --config {{ mysql.server }}
- name: emerge --config {{ mysql.serverpkg }}
- user: root
- creates: {{ mysql_datadir}}/mysql/
- require:
@ -144,9 +144,9 @@ mysqld:
- enable: True
- require:
- pkg: {{ mysql.serverpkg }}
{% if (os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.server != 'mariadb-server') or (os_family in ['Gentoo']) %}
{% if (os_family in ['RedHat', 'Suse'] and mysql.version is defined and mysql.version >= 5.7 and mysql.serverpkg != 'mariadb-server') or (os_family in ['Gentoo']) %}
- cmd: mysql_initialize
{% elif os_family in ['RedHat', 'Suse'] and mysql.server == 'mariadb-server' %}
{% elif os_family in ['RedHat', 'Suse'] and mysql.serverpkg == 'mariadb-server' %}
- file: {{ mysql_datadir }}
{% endif %}
- watch: