- nicer messages

[packages/apache1.git] / apache1-httpd.conf

diff --git a/apache1-httpd.conf b/apache1-httpd.conf
index fc28e69e85b5a3e59c8f651e6a7f241665f849ec..4b67ede263e7b164234bd64b5ac649af740c98bd 100644 (file)
--- a/apache1-httpd.conf
+++ b/apache1-httpd.conf
@@ -1,5 +1,5 @@
 ##
-## httpd.conf -- Apache HTTP server configuration file
+## apache.conf -- Apache HTTP server configuration file
 ##
 
 ##### Global Environment
@@ -17,7 +17,7 @@ ServerType standalone
 # The file in which the server should record its process identification
 # number when it starts.
 
-PidFile /var/run/httpd.pid
+PidFile /var/run/apache.pid
 
 ### Timeout
 # The number of seconds before receives and sends time out.
@@ -61,7 +61,7 @@ ServerRoot "/usr"
 # DISK. The PID of the main server process is automatically appended to
 # the filename. 
 #
-LockFile /var/run/httpd.lock
+LockFile /var/run/apache.lock
 
 ### ScoreBoardFile
 # File used to store internal server process information. Not all
@@ -69,7 +69,7 @@ LockFile /var/run/httpd.lock
 # file will be created when you run Apache) then you *must* ensure that no
 # two invocations of Apache share the same scoreboard file.
 
-ScoreBoardFile /var/run/httpd.scoreboard
+ScoreBoardFile /var/run/apache.scoreboard
 
 #
 # In the standard configuration, the server will process this file,
@@ -231,7 +231,7 @@ ServerAdmin admin@your_domain.org
 # documents. By default, all requests are taken from this directory, but
 # symbolic links and aliases may be used to point to other locations.
 #
-DocumentRoot "/home/services/httpd/html"
+DocumentRoot "/home/services/apache/html"
 
 #
 # Each directory to which Apache has access, can be configured with respect
@@ -256,7 +256,7 @@ DocumentRoot "/home/services/httpd/html"
 #
 # This should be changed to whatever you set DocumentRoot to.
 #
-<Directory "/home/services/httpd/html">
+<Directory "/home/services/apache/html">
 
 #
 # This may also be "None", "All", or any combination of "Indexes",
@@ -382,7 +382,7 @@ DefaultType text/plain
 # module is part of the server.
 #
 <IfModule mod_mime_magic.c>
-       MIMEMagicFile /etc/httpd/magic
+       MIMEMagicFile /etc/apache/magic
 </IfModule>
 
 #
@@ -411,7 +411,7 @@ LogFormat "%{User-agent}i" agent
 # 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 /var/log/httpd/error_log
+ErrorLog /var/log/apache/error_log
 #
 # The location and format of the access logfile (Common Logfile Format).
 # If you do not define any access logfiles within a <VirtualHost>
@@ -419,9 +419,9 @@ ErrorLog /var/log/httpd/error_log
 # define per-<VirtualHost> access logfiles, transactions will be
 # logged therein and *not* in this file.
 #
-CustomLog /var/log/httpd/access_log common
-CustomLog /var/log/httpd/referer_log referer
-CustomLog /var/log/httpd/agent_log agent
+CustomLog /var/log/apache/access_log common
+CustomLog /var/log/apache/referer_log referer
+CustomLog /var/log/apache/agent_log agent
 
 #
 # LogLevel: Control the number of messages logged to the error_log.
@@ -447,18 +447,18 @@ ServerSignature Email
 # require it to be present in the URL.  So "/icons" isn't aliased in this
 # example, only "/icons/"..
 #
-Alias /icons/ "/home/services/httpd/icons/"
+Alias /icons/ "/home/services/apache/icons/"
 
-<Directory "/home/services/httpd/icons">
+<Directory "/home/services/apache/icons">
        Options Indexes MultiViews
        AllowOverride None
        Order allow,deny
        Allow from all
 </Directory>
 
-Alias /manual/ "/home/services/httpd/manual/"
+Alias /manual/ "/home/services/apache/manual/"
 
-<Directory "/home/services/httpd/manual">
+<Directory "/home/services/apache/manual">
        Options Indexes MultiViews
        AllowOverride None
        order deny,allow
@@ -474,13 +474,13 @@ Alias /manual/ "/home/services/httpd/manual/"
 # The same rules about trailing "/" apply to ScriptAlias directives as to
 # Alias.
 #
-ScriptAlias /cgi-bin/ "/home/services/httpd/cgi-bin/"
+ScriptAlias /cgi-bin/ "/home/services/apache/cgi-bin/"
 
 #
-# "/home/services/httpd/cgi-bin" should be changed to whatever your
+# "/home/services/apache/cgi-bin" should be changed to whatever your
 # ScriptAliased CGI directory exists, if you have that configured.
 #
-<Directory "/home/services/httpd/cgi-bin">
+<Directory "/home/services/apache/cgi-bin">
        AllowOverride None
        Options None
        Order allow,deny
@@ -746,9 +746,9 @@ MetaSuffix .meta
 #  N.B.: Many of the environment variables associated with the original
 #  request will *not* be available to such a script.
 
-Alias /errordocs/ "/home/services/httpd/errordocs/"
+Alias /errordocs/ "/home/services/apache/errordocs/"
 
-<Directory /home/services/httpd/errordocs/>
+<Directory /home/services/apache/errordocs/>
        AllowOverride none
        Options IncludesNoExec FollowSymLinks
 </Directory>