saltstack-formulas/nginx-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added test for value None, to be an absent value

Browse Source 
this is needed on archlinux where the pid file is set by systemd
not the nginx.conf file.

In the pillar file you just add
  pid:

an value of 'None' and no pid entry in nginx.conf.
this now works with every None value set in the pillar file
This commit is contained in:
Niels Abspoel 2015-02-11 23:03:10 +01:00
parent 7ae1602745
commit 4a976bf1ab
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nginx/ng/files/nginx.conf
View File

@ -1,6 +1,7 @@
{% set indent_increment = 4 %} {% set indent_increment = 4 %}
{%- macro nginx_block(value, key=None, operator=' ', delim=';', ind=0) -%} {%- macro nginx_block(value, key=None, operator=' ', delim=';', ind=0) -%}
{%- if value != None -%}
{%- if value is number or value is string -%} {%- if value is number or value is string -%}
{{ key|indent(ind, True) }}{{ operator }}{{ value }}{{ delim }} {{ key|indent(ind, True) }}{{ operator }}{{ value }}{{ delim }}
{%- elif value is mapping -%} {%- elif value is mapping -%}
@ -16,6 +17,8 @@
{%- else -%} {%- else -%}
{{ key|indent(ind, True) }}{{ operator }}{{ value }}{{ delim }} {{ key|indent(ind, True) }}{{ operator }}{{ value }}{{ delim }}
{%- endif -%} {%- endif -%}
{%- else -%}
{%- endif -%}
{%- endmacro -%} {%- endmacro -%}
# Default nginx server configuration # Default nginx server configuration