forked from Lainports/opnsense-ports
62 lines
1.8 KiB
Text
62 lines
1.8 KiB
Text
--- docs/conf/httpd.conf.in.orig 2012-02-06 16:54:24 UTC
|
|
+++ docs/conf/httpd.conf.in
|
|
@@ -54,6 +54,9 @@ Listen @@Port@@
|
|
#
|
|
@@LoadModule@@
|
|
|
|
+# Third party modules
|
|
+Include @rel_sysconfdir@/modules.d/[0-9][0-9][0-9]_*.conf
|
|
+
|
|
<IfModule !mpm_netware_module>
|
|
<IfModule !mpm_winnt_module>
|
|
#
|
|
@@ -64,8 +67,8 @@ Listen @@Port@@
|
|
# 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>
|
|
@@ -114,7 +117,6 @@ DocumentRoot "@exp_htdocsdir@"
|
|
# features.
|
|
#
|
|
<Directory />
|
|
- Options FollowSymLinks
|
|
AllowOverride None
|
|
Order deny,allow
|
|
Deny from all
|
|
@@ -185,7 +187,7 @@ DocumentRoot "@exp_htdocsdir@"
|
|
# 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.
|
|
@@ -214,13 +216,13 @@ LogLevel warn
|
|
# 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>
|
|
@@ -416,3 +418,5 @@ DefaultType text/plain
|
|
SSLRandomSeed startup builtin
|
|
SSLRandomSeed connect builtin
|
|
</IfModule>
|
|
+
|
|
+Include @rel_sysconfdir@/Includes/*.conf
|