Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitba0818c

Browse files
author
Felipe Zimmerle
committed
tests: cleans up the apache configuration file
Simplified the apache configuration file, so that, we can handle easilydifferent Apaches versions
1 parent6325ed8 commitba0818c

File tree

1 file changed

+15
-34
lines changed

1 file changed

+15
-34
lines changed
Lines changed: 15 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,30 @@
11
### Base configuration for starting Apache httpd
22

3-
<IfDefine !CHROOT>
4-
# File locations
5-
PidFile @MSC_REGRESSION_LOGS_DIR@/httpd.pid
6-
ScoreBoardFile @MSC_REGRESSION_LOGS_DIR@/httpd.scoreboard
7-
</IfDefine>
8-
9-
<IfModule !mod_proxy.c>
10-
LoadModule proxy_module @APXS_LIBEXECDIR@/mod_proxy.so
11-
LoadModule proxy_http_module @APXS_LIBEXECDIR@/mod_proxy_http.so
12-
</IfModule>
13-
<IfModule !mod_unique_id.c>
14-
LoadModule unique_id_module @APXS_LIBEXECDIR@/mod_unique_id.so
15-
</IfModule>
3+
LoadModule proxy_module @APXS_LIBEXECDIR@/mod_proxy.so
4+
LoadModule proxy_http_module @APXS_LIBEXECDIR@/mod_proxy_http.so
5+
LoadModule unique_id_module @APXS_LIBEXECDIR@/mod_unique_id.so
6+
# TODO: Need to have these configurable
7+
LoadModule security2_module @MSC_BASE_DIR@/apache2/.libs/mod_security2.so
168

17-
<IfDefine !NOMODSEC>
18-
# TODO: Need to have these configurable
19-
LoadModule security2_module @MSC_BASE_DIR@/apache2/.libs/mod_security2.so
20-
</IfDefine>
9+
<IfVersion >= 2.4>
10+
LoadModule access_compat_module /usr/lib/apache2/modules/mod_access_compat.so
11+
LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so
12+
LoadModule authn_core_module /usr/lib/apache2/modules/mod_authn_core.so
13+
LoadModule authz_core_module /usr/lib/apache2/modules/mod_authz_core.so
14+
</IfVersion>
2115

2216
ServerName localhost
23-
2417
CoreDumpDirectory @MSC_REGRESSION_SERVERROOT_DIR@/tmp
25-
2618
LogLevel debug
2719
ErrorLog @MSC_REGRESSION_LOGS_DIR@/error.log
2820

29-
<IfVersion >= 2.4>
30-
LoadModule access_compat_module /usr/lib/apache2/modules/mod_access_compat.so
31-
LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so
32-
</IfVersion>
33-
3421
<IfDefine !CHROOT>
22+
# File locations
23+
PidFile @MSC_REGRESSION_LOGS_DIR@/httpd.pid
24+
ScoreBoardFile @MSC_REGRESSION_LOGS_DIR@/httpd.scoreboard
25+
3526
DocumentRoot @MSC_REGRESSION_DOCROOT_DIR@
3627
<Directory "@MSC_REGRESSION_DOCROOT_DIR@">
3728
Options +Indexes +FollowSymLinks
38-
AllowOverride None
39-
40-
<IfVersion >= 2.4>
41-
Allow from all
42-
Satisfy Any
43-
</IfVersion>
44-
45-
<IfVersion < 2.4>
46-
Require all granted
47-
</IfVersion>
4829
</Directory>
4930
</IfDefine>

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp