Fixes #32: Fix php_extension_conf_path for Debian webserver insanity

This commit is contained in:
Jeff Geerling 2015-04-14 12:58:38 -05:00
parent d378fef32a
commit fda9cfff95
2 changed files with 6 additions and 1 deletions

View File

@ -18,6 +18,11 @@
php_conf_path: "{{ __php_conf_path }}" php_conf_path: "{{ __php_conf_path }}"
when: php_conf_path is not defined when: php_conf_path is not defined
- name: Define php_extension_conf_path.
set_fact:
php_extension_conf_path: "{{ __php_extension_conf_path }}"
when: php_extension_conf_path is not defined
# Setup/install tasks. # Setup/install tasks.
- include: setup-RedHat.yml - include: setup-RedHat.yml
when: ansible_os_family == 'RedHat' when: ansible_os_family == 'RedHat'

View File

@ -16,7 +16,7 @@ __php_webserver_daemon: "apache2"
# Vendor-specific configuration paths on Debian/Ubuntu make my brain asplode. # 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' if php_webserver_daemon and php_webserver_daemon != 'apache2' else '/etc/php5/apache2' }}"
php_extension_conf_path: "/etc/php5/conf.d" __php_extension_conf_path: "{{ __php_conf_path }}/conf.d"
php_apc_conf_filename: 20-apc.ini php_apc_conf_filename: 20-apc.ini
php_fpm_daemon: php5-fpm php_fpm_daemon: php5-fpm