summaryrefslogtreecommitdiff
path: root/www/apache22/files/patch-docs__conf__httpd.conf.in
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache22/files/patch-docs__conf__httpd.conf.in')
-rw-r--r--www/apache22/files/patch-docs__conf__httpd.conf.in52
1 files changed, 52 insertions, 0 deletions
diff --git a/www/apache22/files/patch-docs__conf__httpd.conf.in b/www/apache22/files/patch-docs__conf__httpd.conf.in
new file mode 100644
index 000000000000..e53d974aa7c0
--- /dev/null
+++ b/www/apache22/files/patch-docs__conf__httpd.conf.in
@@ -0,0 +1,52 @@
+--- ./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
+@@ -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