diff --git a/tasks/main.yml b/tasks/main.yml index e9f9c16..4ae5688 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -18,6 +18,11 @@ php_conf_path: "{{ __php_conf_path }}" 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. - include: setup-RedHat.yml when: ansible_os_family == 'RedHat' diff --git a/vars/Debian.yml b/vars/Debian.yml index 55299b6..889e9d4 100644 --- a/vars/Debian.yml +++ b/vars/Debian.yml @@ -16,7 +16,7 @@ __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_extension_conf_path: "/etc/php5/conf.d" +__php_extension_conf_path: "{{ __php_conf_path }}/conf.d" php_apc_conf_filename: 20-apc.ini php_fpm_daemon: php5-fpm