summaryrefslogtreecommitdiff
path: root/www/apache24/files/patch-docs__conf__httpd.conf.in
diff options
context:
space:
mode:
Diffstat (limited to 'www/apache24/files/patch-docs__conf__httpd.conf.in')
-rw-r--r--www/apache24/files/patch-docs__conf__httpd.conf.in49
1 files changed, 49 insertions, 0 deletions
diff --git a/www/apache24/files/patch-docs__conf__httpd.conf.in b/www/apache24/files/patch-docs__conf__httpd.conf.in
new file mode 100644
index 000000000000..a246f6924ce0
--- /dev/null
+++ b/www/apache24/files/patch-docs__conf__httpd.conf.in
@@ -0,0 +1,49 @@
+--- ./docs/conf/httpd.conf.in.orig 2012-11-08 04:05:38.000000000 +0100
++++ ./docs/conf/httpd.conf.in 2013-03-22 18:55:53.000000000 +0100
+@@ -74,8 +74,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>
+
+@@ -181,7 +181,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.
+@@ -210,13 +210,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>
+@@ -406,7 +406,9 @@
+ SSLRandomSeed startup builtin
+ SSLRandomSeed connect builtin
+ </IfModule>
+-#
++
++Include @rel_sysconfdir@/Includes/*.conf
++
+ # uncomment out the below to deal with user agents that deliberately
+ # violate open standards by misusing DNT (DNT *must* be a specific
+ # end-user choice)