File tree Expand file tree Collapse file tree 1 file changed +15
-4
lines changed Expand file tree Collapse file tree 1 file changed +15
-4
lines changed Original file line number Diff line number Diff line change @@ -458,6 +458,19 @@ install:
458
458
#
459
459
460
460
read -r APPLICATION_NAME < "{{.TMP_INSTALL_DIR}}/{{.USER_INPUT}}"
461
+
462
+ if [[ "$CLI_INI_DIR" == */mods-available ]]; then
463
+ CLI_INI_DIR = "${CLI_INI_DIR}/../cli/conf.d"
464
+ fi
465
+ if [[ "$WEB_INI_DIR" == */mods-available ]]; then
466
+ if [[ -d "${WEB_INI_DIR}/../apache2/conf.d" ]]; then
467
+ WEB_INI_DIR="${WEB_INI_DIR}/../apache2/conf.d"
468
+ fi
469
+ if [[ -d "${WEB_INI_DIR}/../fpm/conf.d" ]]; then
470
+ WEB_INI_DIR="${WEB_INI_DIR}/../fpm/conf.d"
471
+ fi
472
+ fi
473
+
461
474
INI_DIRS=($WEB_INI_DIR $CLI_INI_DIR)
462
475
for dirs in $INI_DIRS; do
463
476
for ini in $dirs; do
@@ -520,7 +533,7 @@ install:
520
533
#
521
534
target_ini_dir="/etc/php5/conf.d/"
522
535
if [ -x /usr/sbin/phpquery ]; then
523
- target_ini_dir="${ini}"
536
+ target_ini_dir="${ini}/../../mods-available/ "
524
537
elif [ -x /usr/sbin/php5endmod ]; then
525
538
target_ini_dir="/etc/php5/mods-available/"
526
539
fi
@@ -534,9 +547,7 @@ install:
534
547
# system.
535
548
#
536
549
537
- if [ ! -f "${target_ini_dir}/$(basename ${ini_full_name})" ]; then
538
- mv "${ini_full_name}" "${target_ini_dir}"
539
- fi
550
+ mv ${ini_full_name} ${target_ini_dir}
540
551
541
552
#
542
553
# We rely on the package installer to enable the newrelic module.
You can’t perform that action at this time.
0 commit comments