From fa157ab9a7afda42d972fb8c95c021915f051262 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20Sch=C3=B6ldstr=C3=B6m?= Date: Sat, 20 Feb 2016 15:23:25 -0500 Subject: [PATCH] Closes #53, #60: Fix php.ini not applied for php-fpm on ubuntu --- vars/Debian.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/Debian.yml b/vars/Debian.yml index 3b5647e2..b78ae11e 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -14,7 +14,7 @@ __php_packages: __php_webserver_daemon: "apache2" # Vendor-specific configuration paths on Debian/Ubuntu make my brain asplode. -__php_conf_path: "{{ '/etc/php5' if php_webserver_daemon and php_webserver_daemon != 'apache2' else '/etc/php5/apache2' }}" +__php_conf_path: "{{ '/etc/php5/fpm' if php_enable_webserver and php_enable_php_fpm else '/etc/php5/apache2' if php_enable_webserver and php_webserver_daemon == 'apache2' else '/etc/php5/cli' }}" __php_extension_conf_path: "{{ __php_conf_path }}/conf.d" __php_apc_conf_filename: 20-apcu.ini