Merge pull request #447 from roots/php-error-handling-use-flag

Fix #297 - Use `php_flag` vs `php_admin_flag`
roots · Dec 28, 2015 · 41a316b · 41a316b
2 parents fdb9f56 + 1ea077b
commit 41a316b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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