forked from Lainports/freebsd-ports
164 lines
4.6 KiB
Text
164 lines
4.6 KiB
Text
--- docs/conf/httpd-std.conf.orig Fri Nov 9 07:31:28 2001
|
|
+++ docs/conf/httpd-std.conf Sat Nov 17 01:49:29 2001
|
|
@@ -64,7 +64,7 @@
|
|
#
|
|
<IfModule !mpm_winnt.c>
|
|
<IfModule !perchild.c>
|
|
-ScoreBoardFile logs/apache_runtime_status
|
|
+ScoreBoardFile /var/run/apache_runtime_status
|
|
</IfModule>
|
|
</IfModule>
|
|
|
|
@@ -73,7 +73,7 @@
|
|
# PidFile: The file in which the server should record its process
|
|
# identification number when it starts.
|
|
#
|
|
-PidFile logs/httpd.pid
|
|
+PidFile /var/run/httpd.pid
|
|
|
|
#
|
|
# Timeout: The number of seconds before receives and sends time out.
|
|
@@ -229,8 +229,8 @@
|
|
# when the value of (unsigned)Group is above 60000;
|
|
# don't use Group #-1 on these systems!
|
|
#
|
|
-User nobody
|
|
-Group #-1
|
|
+User www
|
|
+Group www
|
|
</IfModule>
|
|
|
|
#
|
|
@@ -259,7 +259,7 @@
|
|
# documents. By default, all requests are taken from this directory, but
|
|
# symbolic links and aliases may be used to point to other locations.
|
|
#
|
|
-DocumentRoot "@@ServerRoot@@/htdocs"
|
|
+DocumentRoot "@@ServerRoot@@/www/data"
|
|
|
|
#
|
|
# Each directory to which Apache has access, can be configured with respect
|
|
@@ -284,7 +284,7 @@
|
|
#
|
|
# This should be changed to whatever you set DocumentRoot to.
|
|
#
|
|
-<Directory "@@ServerRoot@@/htdocs">
|
|
+<Directory "@@ServerRoot@@/www/data">
|
|
|
|
#
|
|
# This may also be "None", "All", or any combination of "Indexes",
|
|
@@ -377,7 +377,7 @@
|
|
# TypesConfig describes where the mime.types file (or equivalent) is
|
|
# to be found.
|
|
#
|
|
-TypesConfig conf/mime.types
|
|
+TypesConfig etc/apache/mime.types
|
|
|
|
#
|
|
# DefaultType is the default MIME type the server will use for a document
|
|
@@ -396,7 +396,7 @@
|
|
# directive tells the module where the hint definitions are located.
|
|
#
|
|
<IfModule mod_mime_magic.c>
|
|
- MIMEMagicFile conf/magic
|
|
+ MIMEMagicFile etc/apache/magic
|
|
</IfModule>
|
|
|
|
#
|
|
@@ -416,7 +416,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 logs/error_log
|
|
+ErrorLog /var/log/httpd-error.log
|
|
|
|
#
|
|
# LogLevel: Control the number of messages logged to the error_log.
|
|
@@ -441,7 +441,7 @@
|
|
# define per-<VirtualHost> access logfiles, transactions will be
|
|
# logged therein and *not* in this file.
|
|
#
|
|
-CustomLog logs/access_log common
|
|
+#CustomLog logs/access_log common
|
|
|
|
#
|
|
# If you would like to have agent and referer logfiles, uncomment the
|
|
@@ -454,7 +454,7 @@
|
|
# If you prefer a single logfile with access, agent, and referer information
|
|
# (Combined Logfile Format) you can use the following directive.
|
|
#
|
|
-#CustomLog logs/access_log combined
|
|
+CustomLog /var/log/httpd-access.log combined
|
|
|
|
#
|
|
# Optionally add a line containing the server version and virtual host
|
|
@@ -478,9 +478,9 @@
|
|
# We include the /icons/ alias for FancyIndexed directory listings. If you
|
|
# do not use FancyIndexing, you may comment this out.
|
|
#
|
|
-Alias /icons/ "@@ServerRoot@@/icons/"
|
|
+Alias /icons/ "@@ServerRoot@@/www/icons/"
|
|
|
|
-<Directory "@@ServerRoot@@/icons">
|
|
+<Directory "@@ServerRoot@@/www/icons">
|
|
Options Indexes MultiViews
|
|
AllowOverride None
|
|
Order allow,deny
|
|
@@ -492,9 +492,9 @@
|
|
# the manual, even if you choose to move your DocumentRoot. You may comment
|
|
# this out if you do not care for the documentation.
|
|
#
|
|
-Alias /manual "@@ServerRoot@@/manual"
|
|
+Alias /manual "@@ServerRoot@@/share/doc/apache"
|
|
|
|
-<Directory "@@ServerRoot@@/manual">
|
|
+<Directory "@@ServerRoot@@/share/doc/apache">
|
|
Options Indexes FollowSymLinks MultiViews
|
|
AllowOverride None
|
|
Order allow,deny
|
|
@@ -509,21 +509,21 @@
|
|
# The same rules about trailing "/" apply to ScriptAlias directives as to
|
|
# Alias.
|
|
#
|
|
-ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/"
|
|
+ScriptAlias /cgi-bin/ "@@ServerRoot@@/www/cgi-bin/"
|
|
|
|
<IfModule mod_cgid.c>
|
|
#
|
|
# Additional to mod_cgid.c settings, mod_cgid has Scriptsock <path>
|
|
# for setting UNIX socket for communicating with cgid.
|
|
#
|
|
-#Scriptsock logs/cgisock
|
|
+Scriptsock /var/run/cgisock
|
|
</IfModule>
|
|
|
|
#
|
|
# "@@ServerRoot@@/cgi-bin" should be changed to whatever your ScriptAliased
|
|
# CGI directory exists, if you have that configured.
|
|
#
|
|
-<Directory "@@ServerRoot@@/cgi-bin">
|
|
+<Directory "@@ServerRoot@@/www/cgi-bin">
|
|
AllowOverride None
|
|
Options None
|
|
Order allow,deny
|
|
@@ -851,9 +851,9 @@
|
|
#
|
|
|
|
<IfModule mod_include.c>
|
|
- Alias /error/ "@@ServerRoot@@/error/"
|
|
+ Alias /error/ "@@ServerRoot@@/www/error/"
|
|
|
|
- <Directory "@@ServerRoot@@/error">
|
|
+ <Directory "@@ServerRoot@@/www/error">
|
|
AllowOverride None
|
|
Options IncludesNoExec
|
|
AddOutputFilter Includes html
|
|
@@ -964,7 +964,7 @@
|
|
# Bring in additional module-specific configurations
|
|
#
|
|
<IfModule mod_ssl.c>
|
|
- Include conf/ssl.conf
|
|
+ Include etc/apache/ssl.conf
|
|
</IfModule>
|
|
|
|
|