Revert "chore(php): point direct php ini dir"

Author: shashank-reddy-nr

recipes/newrelic/apm/php/debian.yml

@@ -458,19 +458,6 @@ install:
           #
 
           read -r APPLICATION_NAME < "{{.TMP_INSTALL_DIR}}/{{.USER_INPUT}}"
-          
-          if [[ "$CLI_INI_DIR" == */mods-available ]]; then
-             CLI_INI_DIR = "${CLI_INI_DIR}/../cli/conf.d"
-          fi
-          if [[ "$WEB_INI_DIR" == */mods-available ]]; then
-             if [[ -d "${WEB_INI_DIR}/../apache2/conf.d" ]]; then
-                WEB_INI_DIR="${WEB_INI_DIR}/../apache2/conf.d"
-             fi
-             if [[ -d "${WEB_INI_DIR}/../fpm/conf.d" ]]; then
-                WEB_INI_DIR="${WEB_INI_DIR}/../fpm/conf.d"
-             fi
-          fi
-          
           INI_DIRS=($WEB_INI_DIR $CLI_INI_DIR)
           for dirs in $INI_DIRS; do
             for ini in $dirs; do
@@ -533,7 +520,7 @@ install:
               #
               target_ini_dir="/etc/php5/conf.d/"
               if [ -x /usr/sbin/phpquery ]; then
-                target_ini_dir="${ini}/../../mods-available/"
+                target_ini_dir="${ini}"
               elif [ -x /usr/sbin/php5endmod ]; then
                 target_ini_dir="/etc/php5/mods-available/"
               fi
@@ -547,7 +534,9 @@ install:
               # system.
               #
           
-              mv ${ini_full_name} ${target_ini_dir}
+              if [ ! -f "${target_ini_dir}/$(basename ${ini_full_name})" ]; then
+                mv "${ini_full_name}" "${target_ini_dir}"
+              fi
 
               #
               # We rely on the package installer to enable the newrelic module.