From 1ea077bd9abeaab602e418b2e7d542fe9e1a36cd Mon Sep 17 00:00:00 2001 From: Scott Walkinshaw Date: Mon, 28 Dec 2015 14:09:17 -0500 Subject: [PATCH] Fix #297 - Use `php_flag` vs `php_admin_flag` `php_flag` lets `ini_set` override its value whereas `php_admin_flag` does not. This restores a bit more control to WordPress and its debugging constants. --- CHANGELOG.md | 1 + roles/php/templates/php-fpm.conf.j2 | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff579baa94..dea8f0ce71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ### HEAD +* Fixes #297 - Use `php_flag` vs `php_admin_flag` ([#447](https://github.com/roots/trellis/pull/447)) * Fixes #316 - Set WP permalink structure during install ([#316](https://github.com/roots/trellis/pull/316)) * Switch to https://api.ipify.org for IP lookup ([#444](https://github.com/roots/trellis/pull/444)) * Replace `vagrant-hostsupdater` with `vagrant-hostmanager` ([#442](https://github.com/roots/trellis/pull/442)) diff --git a/roles/php/templates/php-fpm.conf.j2 b/roles/php/templates/php-fpm.conf.j2 index 3c5cb90627..b2091aaa87 100644 --- a/roles/php/templates/php-fpm.conf.j2 +++ b/roles/php/templates/php-fpm.conf.j2 @@ -13,8 +13,8 @@ pm.min_spare_servers = 1 pm.max_spare_servers = 3 pm.max_requests = 500 chdir = {{ www_root }}/ -php_admin_flag[log_errors] = on -php_admin_flag[display_errors] = {{ php_display_errors }} +php_flag[log_errors] = on +php_flag[display_errors] = {{ php_display_errors }} php_admin_value[open_basedir] = {{ www_root }}/:/tmp {% if memcached_sessions %} php_value[session.save_handler] = memcached