diff --git a/roles/php-fpm/tasks/main.yml b/roles/php-fpm/tasks/main.yml index 46c3776..04a675f 100644 --- a/roles/php-fpm/tasks/main.yml +++ b/roles/php-fpm/tasks/main.yml @@ -1,11 +1,13 @@ --- +# Note: Debian 9's php-fpm config is identical to Ubuntu 16.04's, so for now we +# can capitalize on that and use the same tasks. - include: Debian.yml - when: ansible_distribution == 'Debian' + when: ansible_distribution == 'Debian' and ansible_distribution_major_version | version_compare('9', '<') tags: php-fpm - include: Ubuntu.yml - when: ansible_distribution == 'Ubuntu' + when: ansible_distribution == 'Ubuntu' or (ansible_distribution == 'Debian' and ansible_distribution_major_version | version_compare('9', '==')) tags: php-fpm # vim: set ts=2 sw=2: diff --git a/roles/php-fpm/templates/php7.0-pool.conf.j2 b/roles/php-fpm/templates/php7.0-pool.conf.j2 index 225b588..d8c5787 100644 --- a/roles/php-fpm/templates/php7.0-pool.conf.j2 +++ b/roles/php-fpm/templates/php7.0-pool.conf.j2 @@ -22,8 +22,13 @@ ; Unix user/group of processes ; Note: The user is mandatory. If the group is not set, the default user's group ; will be used. +{% if ansible_distribution == 'Debian' and ansible_distribution_major_version | version_compare('9', '==') %} +user = www-data +group = www-data +{% else %} user = nginx group = nginx +{% endif %} ; The address on which to accept FastCGI requests. ; Valid syntaxes are: @@ -44,8 +49,13 @@ listen = /run/php/php7.0-fpm-{{ domain_name }}.sock ; BSD-derived systems allow connections regardless of permissions. ; Default Values: user and group are set as the running user ; mode is set to 0660 +{% if ansible_distribution == 'Debian' and ansible_distribution_major_version | version_compare('9', '==') %} +listen.owner = www-data +listen.group = www-data +{% else %} listen.owner = nginx listen.group = nginx +{% endif %} ;listen.mode = 0660 ; When POSIX Access Control Lists are supported you can set them using ; these options, value is a comma separated list of user/group names.