From 4a976bf1ab5645caacbe2a161d62cda9fc4247d9 Mon Sep 17 00:00:00 2001 From: Niels Abspoel Date: Wed, 11 Feb 2015 23:03:10 +0100 Subject: [PATCH] added test for value None, to be an absent value 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 --- nginx/ng/files/nginx.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nginx/ng/files/nginx.conf b/nginx/ng/files/nginx.conf index 8e58e38..5baaa99 100644 --- a/nginx/ng/files/nginx.conf +++ b/nginx/ng/files/nginx.conf @@ -1,6 +1,7 @@ {% set indent_increment = 4 %} {%- macro nginx_block(value, key=None, operator=' ', delim=';', ind=0) -%} + {%- if value != None -%} {%- if value is number or value is string -%} {{ key|indent(ind, True) }}{{ operator }}{{ value }}{{ delim }} {%- elif value is mapping -%} @@ -16,6 +17,8 @@ {%- else -%} {{ key|indent(ind, True) }}{{ operator }}{{ value }}{{ delim }} {%- endif -%} + {%- else -%} + {%- endif -%} {%- endmacro -%} # Default nginx server configuration