Merge branch 'oxyc-php-ini'

This commit is contained in:
Jeff Geerling 2016-02-20 16:48:52 -06:00
commit 705085cb53

View File

@ -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