From 6b5693fd73c699d14c758e5f447d2f1b4ea5dc01 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Thu, 26 Feb 2015 14:31:11 -0600
Subject: [PATCH] Issue #17: Fix for proper configuration paths in
 Debian/Ubuntu for apache2.

---
 tasks/main.yml  | 5 -----
 vars/Debian.yml | 2 +-
 vars/RedHat.yml | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index 4ae5688..e9f9c16 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -18,11 +18,6 @@
     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 7a829a2..76440ef 100644
--- a/vars/Debian.yml
+++ b/vars/Debian.yml
@@ -14,7 +14,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: "{{ __php_conf_path }}/conf.d"
+php_extension_conf_path: "/etc/php5/conf.d"
 
 php_apc_conf_filename: 20-apc.ini
 php_fpm_daemon: php5-fpm
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
index 0ae5e8c..af9e5a2 100644
--- a/vars/RedHat.yml
+++ b/vars/RedHat.yml
@@ -18,7 +18,7 @@ __php_packages:
 __php_webserver_daemon: "httpd"
 
 __php_conf_path: /etc
-__php_extension_conf_path: /etc/php.d
+php_extension_conf_path: /etc/php.d
 
 php_apc_conf_filename: apc.ini
 php_fpm_daemon: php-fpm