diff --git a/php-fpm/defaults/main.yml b/php-fpm/defaults/main.yml index 4df56c336c8357b6ea8a06483c67b5b51f7a37a7..c0a701cf924d33624d08624182c0cdb8b9c4f1c5 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 76b0f30c3ee3aac75bcb21d02c3f2c4793faf6c9..a957c3e6c88c5abb663ca6f95d0f38904ce01dac 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 d4feafc53bbb191778e53c1f07867e75513f4d3a..23c5f02ff7100703234ce60f35c70101fce33b32 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 %}