Skip to content
Snippets Groups Projects
Unverified Commit 2e9b8f9d authored by Niels Abspoel's avatar Niels Abspoel Committed by GitHub
Browse files

Merge pull request #196 from alxwr/master

Prevent None values in config files
parents a8eeeedc a779417b
No related branches found
No related tags found
No related merge requests found
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
[{{ sname }}] [{{ sname }}]
{%- for mparam, mvalue in sdata.items()|default([])|sort -%} {%- for mparam, mvalue in sdata.items()|default([])|sort -%}
{%- if mvalue is none %}{% continue %}{% endif -%}
{%- set indents = 40 - mparam|count %} {%- set indents = 40 - mparam|count %}
{% if mvalue == "noarg_present" -%} {% if mvalue == "noarg_present" -%}
{{ mparam }} {{ mparam }}
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
[{{ sname }}] [{{ sname }}]
{%- for mparam, mvalue in sdata.items()|default([])|sort -%} {%- for mparam, mvalue in sdata.items()|default([])|sort -%}
{%- if mvalue is none %}{% continue %}{% endif -%}
{%- set indents = 40 - mparam|count %} {%- set indents = 40 - mparam|count %}
{% if mvalue == "noarg_present" -%} {% if mvalue == "noarg_present" -%}
{{ mparam }} {{ mparam }}
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
[{{ sname }}] [{{ sname }}]
{%- for mparam, mvalue in sdata.items()|default([])|sort -%} {%- for mparam, mvalue in sdata.items()|default([])|sort -%}
{%- if mvalue is none %}{% continue %}{% endif -%}
{%- set indents = 40 - mparam|count %} {%- set indents = 40 - mparam|count %}
{% if mvalue == "noarg_present" -%} {% if mvalue == "noarg_present" -%}
{{ mparam }} {{ mparam }}
......
...@@ -26,12 +26,14 @@ ...@@ -26,12 +26,14 @@
[{{ sname }}] [{{ sname }}]
{%- for mparam, mvalue in sdata.items()|default([])|sort -%} {%- for mparam, mvalue in sdata.items()|default([])|sort -%}
{%- if mvalue is none %}{% continue %}{% endif -%}
{%- set indents = 40 - mparam|count %} {%- set indents = 40 - mparam|count %}
{% if mvalue == "noarg_present" -%} {% if mvalue == "noarg_present" -%}
{{ mparam }} {{ mparam }}
{%- else -%} {%- else -%}
{%- if mvalue is iterable and mvalue is not string -%} {%- if mvalue is iterable and mvalue is not string -%}
{%- for item in mvalue -%} {%- for item in mvalue -%}
{%- if item is none %}{% continue %}{% endif -%}
{{ mparam }}{{ '='|indent(indents, true) }} {{ item }} {{ mparam }}{{ '='|indent(indents, true) }} {{ item }}
{% endfor -%} {% endfor -%}
{%- else -%} {%- else -%}
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
[{{ sname }}] [{{ sname }}]
{%- for mparam, mvalue in sdata.items()|default([])|sort -%} {%- for mparam, mvalue in sdata.items()|default([])|sort -%}
{%- if mvalue is none %}{% continue %}{% endif -%}
{%- set indents = 40 - mparam|count %} {%- set indents = 40 - mparam|count %}
{% if mvalue == "noarg_present" -%} {% if mvalue == "noarg_present" -%}
{{ mparam }} {{ mparam }}
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
[{{ sname }}] [{{ sname }}]
{%- for mparam, mvalue in sdata.items()|default([])|sort -%} {%- for mparam, mvalue in sdata.items()|default([])|sort -%}
{%- if mvalue is none %}{% continue %}{% endif -%}
{%- set indents = 40 - mparam|count %} {%- set indents = 40 - mparam|count %}
{% if mvalue == "noarg_present" -%} {% if mvalue == "noarg_present" -%}
{{ mparam }} {{ mparam }}
......
...@@ -84,7 +84,7 @@ mysql_install_datadir: ...@@ -84,7 +84,7 @@ mysql_install_datadir:
{% else %} {% else %}
- name: mysql_install_db --user=mysql --basedir=/usr --datadir={{ mysql_datadir }} - name: mysql_install_db --user=mysql --basedir=/usr --datadir={{ mysql_datadir }}
{% endif %} {% endif %}
- user: root - runas: root
- creates: {{ mysql_datadir }}/mysql/user.frm - creates: {{ mysql_datadir }}/mysql/user.frm
- env: - env:
- TMPDIR: '/tmp' - TMPDIR: '/tmp'
...@@ -110,7 +110,7 @@ mysqld-packages: ...@@ -110,7 +110,7 @@ mysqld-packages:
mysql_initialize: mysql_initialize:
cmd.run: cmd.run:
- name: mysqld --initialize-insecure --user=mysql --basedir=/usr --datadir={{ mysql_datadir }} - name: mysqld --initialize-insecure --user=mysql --basedir=/usr --datadir={{ mysql_datadir }}
- user: root - runas: root
- creates: {{ mysql_datadir}}/mysql/ - creates: {{ mysql_datadir}}/mysql/
- require: - require:
- pkg: {{ mysql.serverpkg }} - pkg: {{ mysql.serverpkg }}
...@@ -132,7 +132,7 @@ mysql_initialize: ...@@ -132,7 +132,7 @@ mysql_initialize:
mysql_initialize: mysql_initialize:
cmd.run: cmd.run:
- name: emerge --config {{ mysql.serverpkg }} - name: emerge --config {{ mysql.serverpkg }}
- user: root - runas: root
- creates: {{ mysql_datadir}}/mysql/ - creates: {{ mysql_datadir}}/mysql/
- require: - require:
- pkg: {{ mysql.serverpkg }} - pkg: {{ mysql.serverpkg }}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment