diff --git a/php/defaults/main.yml b/php/defaults/main.yml index d12014b2..5511ba07 100644 --- a/php/defaults/main.yml +++ b/php/defaults/main.yml @@ -4,3 +4,4 @@ php_sury_enable: False php_fpm_enable: False php_apache_enable: False php_symfony_requirements: False +php_fpm_add_www_pool: True diff --git a/php/tasks/fpm.yml b/php/tasks/fpm.yml index b7d169b4..be87752a 100644 --- a/php/tasks/fpm.yml +++ b/php/tasks/fpm.yml @@ -76,7 +76,6 @@ mode: "0644" create: yes with_items: - when: ansible_distribution_major_version | version_compare('9', '>=') - { option: "pm", value: "ondemand" } - { option: "pm.max_children", value: "100" } - { option: "pm.process_idle_timeout", value: "10s" } @@ -86,6 +85,9 @@ - { option: "request_terminate_timeout", value: "60s" } - { option: "chroot", value: "/var/www/html" } notify: restart php-fpm + when: + - php_fpm_add_www_pool | bool + - ansible_distribution_major_version | version_compare('9', '>=') - name: Custom PHP FPM values copy: @@ -96,6 +98,22 @@ mode: "0644" force: no notify: restart php-fpm + when: + - php_fpm_add_www_pool | bool + - ansible_distribution_major_version | version_compare('9', '>=') + +- name: Disable FPM www pool + file: + dest: "{{ item }}" + state: absent + with_items: + - /etc/php/7.0/fpm/pool.d/www.conf + - "{{ php_fpm_defaults_file }}" + - "{{ php_fpm_custom_file }}" + notify: restart php-fpm + when: + - not (php_fpm_add_www_pool | bool) + - ansible_distribution_major_version | version_compare('9', '>=') - name: "Set custom values for PHP to enable Symfony" ini_file: