forked from Lainports/freebsd-ports
171 lines
4.7 KiB
Text
171 lines
4.7 KiB
Text
--- docs/conf/httpd-std.conf.orig Fri Jan 25 09:24:47 2002
|
|
+++ docs/conf/httpd-std.conf Fri Feb 22 02:32:28 2002
|
|
@@ -66,7 +66,7 @@
|
|
#
|
|
<IfModule !mpm_netware.c>
|
|
<IfModule !perchild.c>
|
|
-ScoreBoardFile logs/apache_runtime_status
|
|
+ScoreBoardFile /var/run/apache_runtime_status
|
|
</IfModule>
|
|
</IfModule>
|
|
|
|
@@ -76,7 +76,7 @@
|
|
# identification number when it starts.
|
|
#
|
|
<IfModule !mpm_netware.c>
|
|
-PidFile logs/httpd.pid
|
|
+PidFile /var/run/httpd.pid
|
|
</IfModule>
|
|
|
|
#
|
|
@@ -248,8 +248,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>
|
|
</IfModule>
|
|
|
|
@@ -279,7 +279,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
|
|
@@ -304,7 +304,7 @@
|
|
#
|
|
# This should be changed to whatever you set DocumentRoot to.
|
|
#
|
|
-<Directory "@@ServerRoot@@/htdocs">
|
|
+<Directory "@@ServerRoot@@/www/data">
|
|
|
|
#
|
|
# Possible values for the Options directive are "None", "All",
|
|
@@ -397,7 +397,7 @@
|
|
# TypesConfig describes where the mime.types file (or equivalent) is
|
|
# to be found.
|
|
#
|
|
-TypesConfig conf/mime.types
|
|
+TypesConfig etc/apache2/mime.types
|
|
|
|
#
|
|
# DefaultType is the default MIME type the server will use for a document
|
|
@@ -416,7 +416,7 @@
|
|
# directive tells the module where the hint definitions are located.
|
|
#
|
|
<IfModule mod_mime_magic.c>
|
|
- MIMEMagicFile conf/magic
|
|
+ MIMEMagicFile etc/apache2/magic
|
|
</IfModule>
|
|
|
|
#
|
|
@@ -436,7 +436,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.
|
|
@@ -461,20 +461,20 @@
|
|
# define per-<VirtualHost> access logfiles, transactions will be
|
|
# logged therein and *not* in this file.
|
|
#
|
|
-CustomLog logs/access_log common
|
|
+#CustomLog /var/log/httpd-access_log common
|
|
|
|
#
|
|
# If you would like to have agent and referer logfiles, uncomment the
|
|
# following directives.
|
|
#
|
|
-#CustomLog logs/referer_log referer
|
|
-#CustomLog logs/agent_log agent
|
|
+#CustomLog /var/log/httpd-referer_log referer
|
|
+#CustomLog /var/log/httpd-agent_log agent
|
|
|
|
#
|
|
# 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
|
|
@@ -498,9 +498,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
|
|
@@ -512,9 +512,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
|
|
@@ -529,21 +529,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
|
|
@@ -859,9 +859,9 @@
|
|
|
|
<IfModule mod_negotiation.c>
|
|
<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
|
|
@@ -974,7 +974,7 @@
|
|
# Bring in additional module-specific configurations
|
|
#
|
|
<IfModule mod_ssl.c>
|
|
- Include conf/ssl.conf
|
|
+ Include etc/apache2/ssl.conf
|
|
</IfModule>
|
|
|
|
|