Merge pull request #51 from juwai/master

PR #51: Make `php_apc_conf_filename` and `php_opcache_conf_filename` configurable.
This commit is contained in:
Jeff Geerling 2015-08-20 11:54:06 -05:00
commit 87f4c5442c
3 changed files with 14 additions and 4 deletions

View File

@ -23,6 +23,16 @@
php_extension_conf_path: "{{ __php_extension_conf_path }}"
when: php_extension_conf_path is not defined
- name: Define php_apc_conf_filename.
set_fact:
php_apc_conf_filename: "{{ __php_apc_conf_filename }}"
when: php_apc_conf_filename is not defined
- name: Define php_opcache_conf_filename.
set_fact:
php_opcache_conf_filename: "{{ __php_opcache_conf_filename }}"
when: php_opcache_conf_filename is not defined
# Setup/install tasks.
- include: setup-RedHat.yml
when: (php_install_from_source == false) and (ansible_os_family == 'RedHat')

View File

@ -18,6 +18,6 @@ __php_webserver_daemon: "apache2"
__php_conf_path: "{{ '/etc/php5' if php_webserver_daemon and php_webserver_daemon != 'apache2' else '/etc/php5/apache2' }}"
__php_extension_conf_path: "{{ __php_conf_path }}/conf.d"
php_apc_conf_filename: 20-apc.ini
php_opcache_conf_filename: 05-opcache.ini
__php_apc_conf_filename: 20-apc.ini
__php_opcache_conf_filename: 05-opcache.ini
php_fpm_daemon: php5-fpm

View File

@ -20,6 +20,6 @@ __php_webserver_daemon: "httpd"
__php_conf_path: /etc
php_extension_conf_path: /etc/php.d
php_apc_conf_filename: apc.ini
php_opcache_conf_filename: opcache.ini
__php_apc_conf_filename: apc.ini
__php_opcache_conf_filename: opcache.ini
php_fpm_daemon: php-fpm