From 746b05ca4a1ed35ff920c856df40e0e5dc97412d Mon Sep 17 00:00:00 2001 From: Klaus Zerwes Date: Mon, 7 Nov 2022 17:22:57 +0100 Subject: [PATCH] fix pool.conf template in case some VARs are not defined (#20) vars not defined in defaults should be processed only if they are defined (avoid AnsibleUndefinedVariable errors) Co-authored-by: Klaus Zerwes --- templates/etc/__php__/fpm/pool.d/pool.conf.j2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/etc/__php__/fpm/pool.d/pool.conf.j2 b/templates/etc/__php__/fpm/pool.d/pool.conf.j2 index 3b848fa..7744d23 100644 --- a/templates/etc/__php__/fpm/pool.d/pool.conf.j2 +++ b/templates/etc/__php__/fpm/pool.d/pool.conf.j2 @@ -421,13 +421,19 @@ catch_workers_output = {{ item.catch_workers_output | default('no') }} ;php_admin_value[error_log] = /var/log/fpm-php.www.log ;php_admin_flag[log_errors] = on ;php_admin_value[memory_limit] = 32M +{% if item.php_env is defined %} {% for k, v in item.php_env.items() | list %} env[{{ k }}] = {{ v }} {% endfor %} +{% endif %} +{% if item.php_value is defined %} {% for k, v in item.php_value.items() | list %} php_value[{{ k }}] = {{ v }} {% endfor %} +{% endif %} +{% if item.php_admin_value is defined %} {% for k, v in item.php_admin_value.items() | list %} php_admin_value[{{ k }}] = {{ v }} {% endfor %} +{% endif %} ; vim:filetype=dosini