diff --git a/httpd.conf b/httpd.conf index 78cdc37..d56c2dc 100644 --- a/httpd.conf +++ b/httpd.conf @@ -1,12 +1,11 @@ # -# This is the main Apache server configuration file. It contains the +# This is the main Apache HTTP server configuration file. It contains the # configuration directives that give the server its instructions. -# See for detailed information. -# In particular, see +# See for detailed information. +# In particular, see # # for a discussion of each configuration directive. # -# # Do NOT simply read the instructions in here without understanding # what they do. They're here only as hints or reminders. If you are unsure # consult the online docs. You have been warned. @@ -126,11 +125,11 @@ MaxRequestsPerChild 0 # # Listen: Allows you to bind Apache to specific IP addresses and/or -# ports, in addition to the default. See also the +# ports, instead of the default. See also the # directive. # # Change this to Listen on specific IP addresses as shown below to -# prevent Apache from glomming onto all bound IP addresses (0.0.0.0) +# prevent Apache from glomming onto all bound IP addresses. # #Listen 12.34.56.78:80 Listen 80 @@ -316,30 +315,30 @@ DocumentRoot "/var/www/html" # -# -# Possible values for the Options directive are "None", "All", -# or any combination of: -# Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews -# -# Note that "MultiViews" must be named *explicitly* --- "Options All" -# doesn't give it to you. -# -# The Options directive is both complicated and important. Please see -# http://httpd.apache.org/docs/2.2/mod/core.html#options -# for more information. -# + # + # Possible values for the Options directive are "None", "All", + # or any combination of: + # Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews + # + # Note that "MultiViews" must be named *explicitly* --- "Options All" + # doesn't give it to you. + # + # The Options directive is both complicated and important. Please see + # http://httpd.apache.org/docs/2.2/mod/core.html#options + # for more information. + # Options Indexes FollowSymLinks -# -# AllowOverride controls what directives may be placed in .htaccess files. -# It can be "All", "None", or any combination of the keywords: -# Options FileInfo AuthConfig Limit -# + # + # AllowOverride controls what directives may be placed in .htaccess files. + # It can be "All", "None", or any combination of the keywords: + # Options FileInfo AuthConfig Limit + # AllowOverride None -# -# Controls who can get stuff from this server. -# + # + # Controls who can get stuff from this server. + # Order allow,deny Allow from all @@ -412,11 +411,11 @@ AccessFileName .htaccess # The following lines prevent .htaccess and .htpasswd files from being # viewed by Web clients. # - + Order allow,deny Deny from all Satisfy All - + # # TypesConfig describes where the mime.types file (or equivalent) is