From 0a51826e2f82a61436ec6d1de5c0cce8aa3a9f52 Mon Sep 17 00:00:00 2001
From: Totooow <57631511+Totooow@users.noreply.github.com>
Date: Thu, 6 Oct 2022 16:36:02 +0200
Subject: [PATCH] Add env vars on PHP-FPM pool template (#17)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Théo Adolphe <theo.adolphe@skilleos.com>
---
 tasks/main.yml                                | 3 ++-
 templates/etc/__php__/fpm/pool.d/pool.conf.j2 | 3 +++
 tests/test.yml                                | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 0a3a71d..5ca0e3b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -29,10 +29,11 @@
           listen: "{{ p.listen | default(php_version | php_socket(p.name | default(p.pool_name))) }}",
           user: "{{ p.user | default(php_default_user_group) }}",
           group: "{% if p.user is defined %}{{ p.group | default(p.user) }}{% else %}{{ p.group | default(php_default_user_group) }}{% endif %}",
+          php_env: {% if p.php_env is defined %}{{ p.php_env | to_nice_json }}{% else %}{}{% endif %},
           php_value: {% if p.php_value is defined %}{{ p.php_value | to_nice_json }}{% else %}{}{% endif %},
           php_admin_value: {% if p.php_admin_value is defined %}{{ p.php_admin_value | to_nice_json }}{% else %}{}{% endif %},
           {% for k, v in p.items() | list %}
-          {% if k not in ['name', 'pool_name', 'listen', 'user', 'group', 'php_value', 'php_admin_value'] %}
+          {% if k not in ['name', 'pool_name', 'listen', 'user', 'group', 'php_env', 'php_value', 'php_admin_value'] %}
           {{ k }}: "{{ v }}"{% if not loop.last %},{% endif %}
           {% endif %}
           {% endfor %}
diff --git a/templates/etc/__php__/fpm/pool.d/pool.conf.j2 b/templates/etc/__php__/fpm/pool.d/pool.conf.j2
index 7128181..3b848fa 100644
--- a/templates/etc/__php__/fpm/pool.d/pool.conf.j2
+++ b/templates/etc/__php__/fpm/pool.d/pool.conf.j2
@@ -421,6 +421,9 @@ 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
+{% for k, v in item.php_env.items() | list %}
+env[{{ k }}] = {{ v }}
+{% endfor %}
 {% for k, v in item.php_value.items() | list %}
 php_value[{{ k }}] = {{ v }}
 {% endfor %}
diff --git a/tests/test.yml b/tests/test.yml
index 8918a1c..c87b3cd 100644
--- a/tests/test.yml
+++ b/tests/test.yml
@@ -25,6 +25,8 @@
         ping_response: 'ok'
       - name: 'test_ansible2'
         user: 'foo'
+        php_env:
+          foo: bar
         php_value:
           display_errors: 'Off'
         php_admin_value: