From b2d3984c5aae4dd5f441e4b2ab54602dcc250103 Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Sun, 18 Jun 2017 11:04:30 +0300 Subject: [PATCH] roles/nginx: Fix PHP-FPM socket location on Debian 9 Debian 9 and Ubuntu 16.04 use the same PHP-FPM configuration so we can make use of that here. --- roles/nginx/templates/vhost.conf.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/nginx/templates/vhost.conf.j2 b/roles/nginx/templates/vhost.conf.j2 index c0e1eca..c12d742 100644 --- a/roles/nginx/templates/vhost.conf.j2 +++ b/roles/nginx/templates/vhost.conf.j2 @@ -63,7 +63,8 @@ server { # See: https://httpoxy.org/ fastcgi_param HTTP_PROXY ""; - {% if ansible_distribution_version | version_compare('16.04', '==') %} + {# As of Ubuntu 16.04 and Debian 9, the PHP-FPM configs are the same #} + {% if (ansible_distribution == 'Ubuntu' and ansible_distribution_version | version_compare('16.04', '==')) or (ansible_distribution == 'Debian' and ansible_distribution_major_version | version_compare('9', '==')) %} fastcgi_pass unix:/run/php/php7.0-fpm-{{ domain_name }}.sock; {% else %} fastcgi_pass unix:/var/run/php5-fpm-{{ domain_name }}.sock;