diff options
Diffstat (limited to 'www/apache22/files/patch-docs:conf:httpd-std.conf')
| -rw-r--r-- | www/apache22/files/patch-docs:conf:httpd-std.conf | 63 |
1 files changed, 35 insertions, 28 deletions
diff --git a/www/apache22/files/patch-docs:conf:httpd-std.conf b/www/apache22/files/patch-docs:conf:httpd-std.conf index eb63c30ac79a..8b0665b95c63 100644 --- a/www/apache22/files/patch-docs:conf:httpd-std.conf +++ b/www/apache22/files/patch-docs:conf:httpd-std.conf @@ -1,24 +1,24 @@ ---- 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 @@ +--- 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_winnt.c> + <IfModule !mpm_netware.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 +@@ -76,7 +76,7 @@ # identification number when it starts. # + <IfModule !mpm_netware.c> -PidFile logs/httpd.pid +PidFile /var/run/httpd.pid + </IfModule> # - # Timeout: The number of seconds before receives and sends time out. -@@ -229,8 +229,8 @@ +@@ -248,8 +248,8 @@ # when the value of (unsigned)Group is above 60000; # don't use Group #-1 on these systems! # @@ -27,9 +27,9 @@ +User www +Group www </IfModule> + </IfModule> - # -@@ -259,7 +259,7 @@ +@@ -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. # @@ -37,8 +37,8 @@ +DocumentRoot "@@ServerRoot@@/www/data" # - # Each directory to which Apache has access, can be configured with respect -@@ -284,7 +284,7 @@ + # 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. # @@ -46,26 +46,26 @@ +<Directory "@@ServerRoot@@/www/data"> # - # This may also be "None", "All", or any combination of "Indexes", -@@ -377,7 +377,7 @@ + # 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/apache/mime.types ++TypesConfig etc/apache2/mime.types # # DefaultType is the default MIME type the server will use for a document -@@ -396,7 +396,7 @@ +@@ -416,7 +416,7 @@ # directive tells the module where the hint definitions are located. # <IfModule mod_mime_magic.c> - MIMEMagicFile conf/magic -+ MIMEMagicFile etc/apache/magic ++ MIMEMagicFile etc/apache2/magic </IfModule> # -@@ -416,7 +416,7 @@ +@@ -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. # @@ -74,16 +74,23 @@ # # LogLevel: Control the number of messages logged to the error_log. -@@ -441,7 +441,7 @@ +@@ -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 logs/access_log common ++#CustomLog /var/log/httpd-access_log common # # If you would like to have agent and referer logfiles, uncomment the -@@ -454,7 +454,7 @@ + # 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. # @@ -92,7 +99,7 @@ # # Optionally add a line containing the server version and virtual host -@@ -478,9 +478,9 @@ +@@ -498,9 +498,9 @@ # We include the /icons/ alias for FancyIndexed directory listings. If you # do not use FancyIndexing, you may comment this out. # @@ -104,7 +111,7 @@ Options Indexes MultiViews AllowOverride None Order allow,deny -@@ -492,9 +492,9 @@ +@@ -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. # @@ -116,7 +123,7 @@ Options Indexes FollowSymLinks MultiViews AllowOverride None Order allow,deny -@@ -509,21 +509,21 @@ +@@ -529,21 +529,21 @@ # The same rules about trailing "/" apply to ScriptAlias directives as to # Alias. # @@ -141,9 +148,9 @@ AllowOverride None Options None Order allow,deny -@@ -851,9 +851,9 @@ - # +@@ -859,9 +859,9 @@ + <IfModule mod_negotiation.c> <IfModule mod_include.c> - Alias /error/ "@@ServerRoot@@/error/" + Alias /error/ "@@ServerRoot@@/www/error/" @@ -153,12 +160,12 @@ AllowOverride None Options IncludesNoExec AddOutputFilter Includes html -@@ -964,7 +964,7 @@ +@@ -974,7 +974,7 @@ # Bring in additional module-specific configurations # <IfModule mod_ssl.c> - Include conf/ssl.conf -+ Include etc/apache/ssl.conf ++ Include etc/apache2/ssl.conf </IfModule> |