From 52d2f846f99395a527497d735866bcc2642a03ee Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Fri, 18 Jan 2019 17:11:12 +0100
Subject: [PATCH] php-fpm: remove standard pool, add admin flags
---
php-fpm/defaults/main.yml | 6 +-----
php-fpm/tasks/main.yml | 14 --------------
php-fpm/templates/pool.conf.j2 | 8 +++++++-
3 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/php-fpm/defaults/main.yml b/php-fpm/defaults/main.yml
index 4df56c3..c0a701c 100644
--- a/php-fpm/defaults/main.yml
+++ b/php-fpm/defaults/main.yml
@@ -1,8 +1,4 @@
---
# file: php-fpm/defaults/mail.yml
-fpm_pool: www
-fpm_user: www-data
-fpm_group: www-data
-fpm_socket_user: www-data
-fpm_socket_group: www-data
+fpm_pools: []
diff --git a/php-fpm/tasks/main.yml b/php-fpm/tasks/main.yml
index 76b0f30..a957c3e 100644
--- a/php-fpm/tasks/main.yml
+++ b/php-fpm/tasks/main.yml
@@ -23,20 +23,6 @@
- php-fpm
- webservices
-- name: ensure we have the pool we want
- template:
- src: pool.conf.j2
- dest: "/etc/php/7.0/fpm/pool.d/{{ fpm_pool }}.conf"
- owner: root
- group: root
- mode: '0644'
- when: debian_version == "stretch"
- notify:
- - restart php-fpm
- tags:
- - php-fpm
- - webservices
-
- name: ensure we have all the pools we want
template:
src: pool.conf.j2
diff --git a/php-fpm/templates/pool.conf.j2 b/php-fpm/templates/pool.conf.j2
index d4feafc..23c5f02 100644
--- a/php-fpm/templates/pool.conf.j2
+++ b/php-fpm/templates/pool.conf.j2
@@ -17,6 +17,12 @@ pm.max_requests = 500
{% if item.params is defined and item.params %}
{% for key, value in item.params.items() %}
-php_value[{{key}}] = {{value}};
+php_admin_value[{{key}}] = {{value}};
+{% endfor %}
+{% endif %}
+
+{% if item.flags is defined and item.flags %}
+{% for key, value in item.flags.items() %}
+php_admin_flag[{{key}}] = {{'on' if value else 'off'}};
{% endfor %}
{% endif %}
--
GitLab