tests: cleans up the apache configuration file

Simplified the apache configuration file, so that, we can handle easily
different Apaches versions
This commit is contained in:
Felipe Zimmerle 2014-01-01 16:09:21 -08:00
parent 6325ed8d41
commit ba0818ca32

View File

@ -1,49 +1,30 @@
### Base configuration for starting Apache httpd
LoadModule proxy_module @APXS_LIBEXECDIR@/mod_proxy.so
LoadModule proxy_http_module @APXS_LIBEXECDIR@/mod_proxy_http.so
LoadModule unique_id_module @APXS_LIBEXECDIR@/mod_unique_id.so
# TODO: Need to have these configurable
LoadModule security2_module @MSC_BASE_DIR@/apache2/.libs/mod_security2.so
<IfVersion >= 2.4>
LoadModule access_compat_module /usr/lib/apache2/modules/mod_access_compat.so
LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so
LoadModule authn_core_module /usr/lib/apache2/modules/mod_authn_core.so
LoadModule authz_core_module /usr/lib/apache2/modules/mod_authz_core.so
</IfVersion>
ServerName localhost
CoreDumpDirectory @MSC_REGRESSION_SERVERROOT_DIR@/tmp
LogLevel debug
ErrorLog @MSC_REGRESSION_LOGS_DIR@/error.log
<IfDefine !CHROOT>
# File locations
PidFile @MSC_REGRESSION_LOGS_DIR@/httpd.pid
ScoreBoardFile @MSC_REGRESSION_LOGS_DIR@/httpd.scoreboard
</IfDefine>
<IfModule !mod_proxy.c>
LoadModule proxy_module @APXS_LIBEXECDIR@/mod_proxy.so
LoadModule proxy_http_module @APXS_LIBEXECDIR@/mod_proxy_http.so
</IfModule>
<IfModule !mod_unique_id.c>
LoadModule unique_id_module @APXS_LIBEXECDIR@/mod_unique_id.so
</IfModule>
<IfDefine !NOMODSEC>
# TODO: Need to have these configurable
LoadModule security2_module @MSC_BASE_DIR@/apache2/.libs/mod_security2.so
</IfDefine>
ServerName localhost
CoreDumpDirectory @MSC_REGRESSION_SERVERROOT_DIR@/tmp
LogLevel debug
ErrorLog @MSC_REGRESSION_LOGS_DIR@/error.log
<IfVersion >= 2.4>
LoadModule access_compat_module /usr/lib/apache2/modules/mod_access_compat.so
LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so
</IfVersion>
<IfDefine !CHROOT>
DocumentRoot @MSC_REGRESSION_DOCROOT_DIR@
<Directory "@MSC_REGRESSION_DOCROOT_DIR@">
Options +Indexes +FollowSymLinks
AllowOverride None
<IfVersion >= 2.4>
Allow from all
Satisfy Any
</IfVersion>
<IfVersion < 2.4>
Require all granted
</IfVersion>
</Directory>
</IfDefine>