- added "Listen 80" for allow start apache with default configuration

  correctly when mod_ssl is used,
- some cosmetics and comments reorganizations.

Changed files:
    apache-httpd.conf -> 1.16

diff --git a/apache-httpd.conf b/apache-httpd.conf
index 53b11ff2a816092a48d53dd7b21e0b7bb40f7d18..cfc470de1d7aad833dde99983882479dc2293060 100644 (file)
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -39,9 +39,9 @@ KeepAliveTimeout      15
 KeepAlive              On
 MaxKeepAliveRequests   100
 
-#
-# ServerRoot: The top of the directory tree under which the server's
-# configuration, error, and log files are kept.
+### ServerRoot
+# The top of the directory tree under which the server's configuration,
+# error, and log files are kept.
 #
 # NOTE!  If you intend to place this on an NFS (or otherwise network)
 # mounted filesystem then please read the LockFile documentation
@@ -52,7 +52,7 @@ MaxKeepAliveRequests  100
 #
 ServerRoot "/usr"
 
-#
+### LockFile
 # The LockFile directive sets the path to the lockfile used when Apache
 # is compiled with either USE_FCNTL_SERIALIZED_ACCEPT or
 # USE_FLOCK_SERIALIZED_ACCEPT. This directive should normally be left at
@@ -63,12 +63,12 @@ ServerRoot "/usr"
 #
 LockFile /var/run/httpd.lock
 
-#
-# ScoreBoardFile: File used to store internal server process information.
-# Not all architectures require this.  But if yours does (you'll know because
-# this file will be  created when you run Apache) then you *must* ensure that
-# no two invocations of Apache share the same scoreboard file.
-#
+### ScoreBoardFile
+# File used to store internal server process information.
+# architectures require this. But if yours does (you'll know because this
+# 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
 
 #
@@ -125,27 +125,26 @@ MaxClients 150
 #
 MaxRequestsPerChild 30
 
-#
-# Listen: Allows you to bind Apache to specific IP addresses and/or
-# ports, in addition to the default. See also the <VirtualHost>
-# directive.
-#
-#Listen 3000
+### Listen
+# Allows you to bind Apache to specific IP addresses and/or ports, in
+# addition to the default. See also the <VirtualHost> directive.
+
 #Listen 12.34.56.78:80
+Listen 80
+
+### BindAddress
+# You can support virtual hosts with this option. This directive is used to
+# tell the server which IP address to listen to. It can either contain "*",
+# an IP address, or a fully qualified Internet domain name. See also the
+# <VirtualHost> and Listen directives.
 
-#
-# BindAddress: You can support virtual hosts with this option. This directive
-# is used to tell the server which IP address to listen to. It can either
-# contain "*", an IP address, or a fully qualified Internet domain name.
-# See also the <VirtualHost> and Listen directives.
-#
 #BindAddress *
 
-#
-# ExtendedStatus controls whether Apache will generate "full" status
-# information (ExtendedStatus On) or just basic information (ExtendedStatus
-# Off) when the "server-status" handler is called. The default is Off.
-#
+### ExtendedStatus
+# controls whether Apache will generate "full" status information
+# (ExtendedStatus On) or just basic information (ExtendedStatus Off) when
+# the "server-status" handler is called. The default is Off.
+
 #ExtendedStatus On
 
 ### Section 2: Dynamic Shared Object (DSO) Support
@@ -188,15 +187,7 @@ Port 80
 # If you wish httpd to run as a different user or group, you must run
 # httpd as root initially and it will switch.  
 #
-# User/Group: The name (or #number) of the user/group to run httpd as.
-#  . On SCO (ODT 3) use "User nouser" and "Group nogroup".
-#  . On HPUX you may not be able to use shared memory as nobody, and the
-#    suggested workaround is to create a user www and use that user.
-#  NOTE that some kernels refuse to setgid(Group) or semctl(IPC_SET)
-#  when the value of (unsigned)Group is above 60000; 
-#  don't use Group  on these systems!
-#
-User http
+User  http
 Group http
 
 #
@@ -236,8 +227,8 @@ DocumentRoot "/home/httpd/html"
 # permissions.  
 #
 <Directory />
-    Options FollowSymLinks
-    AllowOverride None
+       Options FollowSymLinks
+       AllowOverride None
 </Directory>
 
 #
@@ -259,20 +250,20 @@ DocumentRoot "/home/httpd/html"
 # Note that "MultiViews" must be named *explicitly* --- "Options All"
 # doesn't give it to you.
 #
-    Options Indexes FollowSymLinks
+       Options Indexes FollowSymLinks
 
 #
 # This controls which options the .htaccess files in directories can
 # override. Can also be "All", or any combination of "Options", "FileInfo", 
 # "AuthConfig", and "Limit"
 #
-    AllowOverride None
+       AllowOverride None
 
 #
 # Controls who can get stuff from this server.
 #
-    Order allow,deny
-    Allow from all
+       Order allow,deny
+       Allow from all
 </Directory>
 
 #
@@ -303,7 +294,7 @@ UserDir public_html
 # directory index.  Separate multiple entries with spaces.
 #
 <IfModule mod_dir.c>
-DirectoryIndex index.html index.htm index.shtml index.cgi
+DirectoryIndex index.html index.htm index.shtml index.cgi index.php
 </IfModule>
 
 #
@@ -321,8 +312,8 @@ AccessFileName .htaccess
 # be sure to make the corresponding changes here.
 #
 <Files .htaccess>
-    Order allow,deny
-    Deny from all
+       Order allow,deny
+       Deny from all
 </Files>
 
 #
@@ -385,22 +376,6 @@ DefaultType text/plain
 #
 HostnameLookups Off
 
-#
-# ErrorLog: The location of the error log file.
-# If you do not specify an ErrorLog directive within a <VirtualHost>
-# container, error messages relating to that virtual host will be
-# 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
-
-#
-# LogLevel: Control the number of messages logged to the error_log.
-# Possible values include: debug, info, notice, warn, error, crit,
-# alert, emerg.
-#
-LogLevel warn
-
 #
 # The following directives define some format nicknames for use with
 # a CustomLog directive (see below).
@@ -410,6 +385,14 @@ LogFormat "%h %l %u %t \"%r\" %>s %b" common
 LogFormat "%{Referer}i -> %U" referer
 LogFormat "%{User-agent}i" agent
 
+#
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# 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
 #
 # The location and format of the access logfile (Common Logfile Format).
 # If you do not define any access logfiles within a <VirtualHost>
@@ -418,19 +401,15 @@ LogFormat "%{User-agent}i" agent
 # logged therein and *not* in this file.
 #
 CustomLog /var/log/httpd/access_log common
-
-#
-# If you would like to have agent and referer logfiles, uncomment the
-# following directives.
-#
 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.
+# LogLevel: Control the number of messages logged to the error_log.
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
 #
-#CustomLog /var/log/httpd/access_log combined
+LogLevel warn
 
 #
 # Optionally add a line containing the server version and virtual host
@@ -673,8 +652,8 @@ MetaSuffix .meta
 Alias /errordocs/ "/home/httpd/errordocs/"
 
 <Directory /home/httpd/errordocs/>
-   AllowOverride none
-   Options IncludesNoExec FollowSymLinks
+       AllowOverride none
+       Options IncludesNoExec FollowSymLinks
 </Directory>
 
 ErrorDocument 400      /errordocs/400.shtml
@@ -732,4 +711,3 @@ BrowserMatch "JDK/1\.0" force-response-1.0
 #      Deny from all
 #      ErrorDocument 403 http://phf.apache.org/phf_abuse_log.cgi
 #</Location>
-