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

Merge branch 'master' of https://github.com/saltstack-formulas/mysql-formula

Browse source
This commit is contained in:
Roman Pertl 2015-09-29 18:54:52 +00:00
commit 429aba9ec9
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql/database.sls
View file

@ -35,7 +35,7 @@ include:
{{ state_id }}_load: {{ state_id }}_load:
cmd.wait: cmd.wait:
- name: mysql -u root -p{{ mysql_root_pass }} {{ database }} < /etc/mysql/{{ database }}.schema - name: mysql -u {{ mysql_root_user }} -p{{ mysql_root_pass }} {{ database }} < /etc/mysql/{{ database }}.schema
- watch: - watch:
- file: {{ state_id }}_schema - file: {{ state_id }}_schema
- mysql_database: {{ state_id }} - mysql_database: {{ state_id }}

12
mysql/server.sls
View file

@ -15,11 +15,11 @@ mysql_debconf_utils:
mysql_debconf: mysql_debconf:
debconf.set: debconf.set:
- name: mysql-server - name: {{ mysql.server }}
- data: - data:
'mysql-server/root_password': {'type': 'password', 'value': '{{ mysql_root_password }}'} '{{ mysql.server }}/root_password': {'type': 'password', 'value': '{{ mysql_root_password }}'}
'mysql-server/root_password_again': {'type': 'password', 'value': '{{ mysql_root_password }}'} '{{ mysql.server }}/root_password_again': {'type': 'password', 'value': '{{ mysql_root_password }}'}
'mysql-server/start_on_boot': {'type': 'boolean', 'value': 'true'} '{{ mysql.server }}/start_on_boot': {'type': 'boolean', 'value': 'true'}
- require_in: - require_in:
- pkg: mysqld - pkg: mysqld
- require: - require:
@ -27,8 +27,8 @@ mysql_debconf:
{% elif os_family == 'RedHat' or os_family == 'Suse' or os_family == 'Arch' %} {% elif os_family == 'RedHat' or os_family == 'Suse' or os_family == 'Arch' %}
mysql_root_password: mysql_root_password:
cmd.run: cmd.run:
- name: mysqladmin --user root password '{{ mysql_root_password|replace("'", "'\"'\"'") }}' - name: mysqladmin --user {{ mysql_root_user }} password '{{ mysql_root_password|replace("'", "'\"'\"'") }}'
- unless: mysql --user root --password='{{ mysql_root_password|replace("'", "'\"'\"'") }}' --execute="SELECT 1;" - unless: mysql --user {{ mysql_root_user }} --password='{{ mysql_root_password|replace("'", "'\"'\"'") }}' --execute="SELECT 1;"
- require: - require:
- service: mysqld - service: mysqld
{% endif %} {% endif %}