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 #196 from alxwr/master

Browse source 
Prevent None values in config files
This commit is contained in:
Niels Abspoel 2018-09-08 22:31:42 +02:00 • committed by GitHub
commit 2e9b8f9d4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql/files/client.cnf
View file

@ -26,6 +26,7 @@
[{{ sname }}]
{%- for mparam, mvalue in sdata.items()|default([])|sort -%}
{%- if mvalue is none %}{% continue %}{% endif -%}
{%- set indents = 40 - mparam|count %}
{% if mvalue == "noarg_present" -%}
{{ mparam }}

1
mysql/files/galera.cnf
View file

@ -26,6 +26,7 @@
[{{ sname }}]
{%- for mparam, mvalue in sdata.items()|default([])|sort -%}
{%- if mvalue is none %}{% continue %}{% endif -%}
{%- set indents = 40 - mparam|count %}
{% if mvalue == "noarg_present" -%}
{{ mparam }}

1
mysql/files/my-include.cnf
View file

@ -30,6 +30,7 @@
[{{ sname }}]
{%- for mparam, mvalue in sdata.items()|default([])|sort -%}
{%- if mvalue is none %}{% continue %}{% endif -%}
{%- set indents = 40 - mparam|count %}
{% if mvalue == "noarg_present" -%}
{{ mparam }}

2
mysql/files/my.cnf
View file

@ -26,12 +26,14 @@
[{{ sname }}]
{%- for mparam, mvalue in sdata.items()|default([])|sort -%}
{%- if mvalue is none %}{% continue %}{% endif -%}
{%- set indents = 40 - mparam|count %}
{% if mvalue == "noarg_present" -%}
{{ mparam }}
{%- else -%}
{%- if mvalue is iterable and mvalue is not string -%}
{%- for item in mvalue -%}
{%- if item is none %}{% continue %}{% endif -%}
{{ mparam }}{{ '='|indent(indents, true) }} {{ item }}
{% endfor -%}
{%- else -%}

1
mysql/files/mysql-clients.cnf
View file

@ -26,6 +26,7 @@
[{{ sname }}]
{%- for mparam, mvalue in sdata.items()|default([])|sort -%}
{%- if mvalue is none %}{% continue %}{% endif -%}
{%- set indents = 40 - mparam|count %}
{% if mvalue == "noarg_present" -%}
{{ mparam }}

1
mysql/files/server.cnf
View file

@ -26,6 +26,7 @@
[{{ sname }}]
{%- for mparam, mvalue in sdata.items()|default([])|sort -%}
{%- if mvalue is none %}{% continue %}{% endif -%}
{%- set indents = 40 - mparam|count %}
{% if mvalue == "noarg_present" -%}
{{ mparam }}

6
mysql/server.sls
View file

@ -84,7 +84,7 @@ mysql_install_datadir:
{% else %}
- name: mysql_install_db --user=mysql --basedir=/usr --datadir={{ mysql_datadir }}
{% endif %}
- user: root
- runas: root
- creates: {{ mysql_datadir }}/mysql/user.frm
- env:
- TMPDIR: '/tmp'
@ -110,7 +110,7 @@ mysqld-packages:
mysql_initialize:
cmd.run:
- name: mysqld --initialize-insecure --user=mysql --basedir=/usr --datadir={{ mysql_datadir }}
- user: root
- runas: root
- creates: {{ mysql_datadir}}/mysql/
- require:
- pkg: {{ mysql.serverpkg }}
@ -132,7 +132,7 @@ mysql_initialize:
mysql_initialize:
cmd.run:
- name: emerge --config {{ mysql.serverpkg }}
- user: root
- runas: root
- creates: {{ mysql_datadir}}/mysql/
- require:
- pkg: {{ mysql.serverpkg }}