From 4a74fac4202980051f0c7adb12fa03631efde1a7 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Sun, 23 Apr 2017 20:17:38 +0300
Subject: [PATCH] - Correct handling of missing parameters for the www pool.
---
defaults/main.yml | 2 +-
templates/php-fpm/pools/www.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/defaults/main.yml b/defaults/main.yml
index 48c28d5..f47dee4 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -20,4 +20,4 @@ php_fpm_www_pool_config:
pm.status_path: /status.php
ping.path: /ping.php
chdir: /
- chroot: '{{ php_fpm_chroot[ansible_os_family]|default(None) }}'
+ chroot: '{{ php_fpm_chroot[ansible_os_family]|default("") }}'
diff --git a/templates/php-fpm/pools/www.conf b/templates/php-fpm/pools/www.conf
index 4ae0280..8ca8789 100644
--- a/templates/php-fpm/pools/www.conf
+++ b/templates/php-fpm/pools/www.conf
@@ -1,4 +1,4 @@
[www]
-{% for key, value in php_fpm_www_pool_config.iteritems() if not value == None %}
+{% for key, value in php_fpm_www_pool_config.iteritems() if not value == '' %}
{{ key }} = {{ value }}
{% endfor %}
--
GitLab