honor php_install_fpm in case it is set to 'false' (#19)

Co-authored-by: Klaus Zerwes <Klaus.Zerwes@rosalux.org>
master
Klaus Zerwes 2022-11-07 11:03:58 +01:00 committed by GitHub
parent 0a51826e2f
commit b4afb45dd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions

View File

@ -22,6 +22,7 @@
group: root group: root
mode: 0644 mode: 0644
loop: "{{ php_ini | combine(php_ini_fpm) | dict2items }}" loop: "{{ php_ini | combine(php_ini_fpm) | dict2items }}"
when: php_install_fpm | bool
notify: Restart php-fpm notify: Restart php-fpm
- name: TEMPLATE | Deploy pool configuration - name: TEMPLATE | Deploy pool configuration
@ -32,11 +33,14 @@
group: root group: root
mode: 0644 mode: 0644
loop: "{{ ansible_local.hanxhx_php.fpm_pool }}" loop: "{{ ansible_local.hanxhx_php.fpm_pool }}"
when: php_install_fpm | bool
notify: Restart php-fpm notify: Restart php-fpm
- name: FILE | Delete default pool if necessary - name: FILE | Delete default pool if necessary
ansible.builtin.file: ansible.builtin.file:
path: "{{ php_fpm_pool_dir }}/www.conf" path: "{{ php_fpm_pool_dir }}/www.conf"
state: absent state: absent
when: '"www" not in (ansible_local.hanxhx_php.fpm_pool | map(attribute="name") | list) and php_autoremove_default_pool' when:
- '"www" not in (ansible_local.hanxhx_php.fpm_pool | map(attribute="name") | list) and php_autoremove_default_pool'
- php_install_fpm | bool
notify: Restart php-fpm notify: Restart php-fpm