summaryrefslogtreecommitdiff
path: root/www/apache22/files/patch-docs__conf__httpd.conf.in
blob: 0ab0dbe6aae3aa571e0e454a0c8a08b5c646abef (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
--- ./docs/conf/httpd.conf.in.orig	2007-12-21 06:43:00.000000000 -0500
+++ ./docs/conf/httpd.conf.in	2010-05-06 19:37:54.224731824 -0400
@@ -54,6 +54,9 @@
 #
 @@LoadModule@@
 
+# Third party modules
+Include @rel_sysconfdir@/modules.d/[0-9][0-9][0-9]_*.conf
+
 <IfModule !mpm_netware_module>
 <IfModule !mpm_winnt_module>
 #
@@ -63,8 +63,8 @@
 # It is usually good practice to create a dedicated user and group for
 # running httpd, as with most system services.
 #
-User daemon
-Group daemon
+User %%WWWOWN%%
+Group %%WWWGRP%%
 
 </IfModule>
 </IfModule>
@@ -113,7 +113,6 @@
 # features.  
 #
 <Directory />
-    Options FollowSymLinks
     AllowOverride None
     Order deny,allow
     Deny from all
@@ -184,7 +183,7 @@
 # logged here.  If you *do* define an error logfile for a <VirtualHost>
 # container, that host's errors will be logged there and not here.
 #
-ErrorLog "@rel_logfiledir@/error_log"
+ErrorLog "@rel_logfiledir@/httpd-error.log"
 
 #
 # LogLevel: Control the number of messages logged to the error_log.
@@ -213,13 +212,13 @@
     # define per-<VirtualHost> access logfiles, transactions will be
     # logged therein and *not* in this file.
     #
-    CustomLog "@rel_logfiledir@/access_log" common
+    #CustomLog "@rel_logfiledir@/httpd-access.log" common
 
     #
     # If you prefer a logfile with access, agent, and referer information
     # (Combined Logfile Format) you can use the following directive.
     #
-    #CustomLog "@rel_logfiledir@/access_log" combined
+    CustomLog "@rel_logfiledir@/httpd-access.log" combined
 </IfModule>
 
 <IfModule alias_module>
@@ -408,3 +407,5 @@
 SSLRandomSeed startup builtin
 SSLRandomSeed connect builtin
 </IfModule>
+
+Include @rel_sysconfdir@/Includes/*.conf