From c024ce31d8c5eb565134b65f0be59f28f786b6a4 Mon Sep 17 00:00:00 2001 From: "Bernhard R. Fischer" Date: Tue, 24 Jul 2018 19:08:45 +0200 Subject: [PATCH] added path information for correct detection of config files and modules of Apache 2.4 (standard installation from ports tree) on FreeBSD (#562) --- include/tests_webservers | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/tests_webservers b/include/tests_webservers index d54d2796..b9ca72c7 100644 --- a/include/tests_webservers +++ b/include/tests_webservers @@ -29,7 +29,7 @@ # Reset Apache status APACHE_INSTALLED=0 APACHE_MODULES_ENABLED_LOCS="${ROOTDIR}etc/apache2/mods-enabled" - APACHE_MODULES_LOCS="${ROOTDIR}etc/httpd/modules ${ROOTDIR}opt/local/apache2/modules ${ROOTDIR}usr/lib/apache ${ROOTDIR}usr/lib/apache2 ${ROOTDIR}usr/lib/httpd/modules ${ROOTDIR}usr/libexec/apache2 ${ROOTDIR}usr/lib64/apache2 ${ROOTDIR}usr/lib64/apache2/modules ${ROOTDIR}usr/lib64/httpd/modules ${ROOTDIR}usr/local/libexec/apache ${ROOTDIR}usr/local/libexec/apache22" + APACHE_MODULES_LOCS="${ROOTDIR}etc/httpd/modules ${ROOTDIR}opt/local/apache2/modules ${ROOTDIR}usr/lib/apache ${ROOTDIR}usr/lib/apache2 ${ROOTDIR}usr/lib/httpd/modules ${ROOTDIR}usr/libexec/apache2 ${ROOTDIR}usr/lib64/apache2 ${ROOTDIR}usr/lib64/apache2/modules ${ROOTDIR}usr/lib64/httpd/modules ${ROOTDIR}usr/local/libexec/apache ${ROOTDIR}usr/local/libexec/apache22 ${ROOTDIR}usr/local/libexec/apache24" NGINX_RUNNING=0 NGINX_CONF_LOCS="${ROOTDIR}etc/nginx ${ROOTDIR}usr/local/etc/nginx ${ROOTDIR}usr/local/nginx/conf" NGINX_CONF_LOCATION="" @@ -42,7 +42,7 @@ ${ROOTDIR}opt/apache \ ${ROOTDIR}usr/local/apache ${ROOTDIR}usr/local/apache2 \ ${ROOTDIR}usr/local/etc/apache ${ROOTDIR}usr/local/etc/apache2 ${ROOTDIR}usr/local/etc/apache22 \ - ${ROOTDIR}usr/pkg/etc/httpd ${ROOTDIR}etc/sysconfig/apache2" + ${ROOTDIR}usr/pkg/etc/httpd ${ROOTDIR}etc/sysconfig/apache2 ${ROOTDIR}usr/local/etc/apache24" CreateTempFile || ExitFatal TMPFILE="${TEMP_FILE}"