- load mod_unixd after serverroot was set (so correct serverroot gets used)

[packages/apache.git] / apache-common.conf

diff --git a/apache-common.conf b/apache-common.conf
index 40018149b6bcfe0e42f260fefe29e5e3629ff7ce..8643668fb619b8f4be48370700fdfde7c44569d0 100644 (file)
--- a/apache-common.conf
+++ b/apache-common.conf
@@ -13,11 +13,10 @@ DocumentRoot "/home/services/httpd/html"
 # features.
 #
 <Directory />
-    Options FollowSymLinks
-    AllowOverride None
+       Options FollowSymLinks
+       AllowOverride None
        <IfModule mod_authz_host.c>
-               Order deny,allow
-               Deny from all
+               Require all denied
        </IfModule>
 </Directory>
 
@@ -25,78 +24,32 @@ DocumentRoot "/home/services/httpd/html"
 # This should be changed to whatever you set DocumentRoot to.
 #
 <Directory "/home/services/httpd/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.
-    #
-    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 None
-
-    #
-    # Controls who can get stuff from this server.
-    #
+       #
+       # 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 None
+
+       #
+       # Controls who can get stuff from this server.
+       #
        <IfModule mod_authz_host.c>
-               Order allow,deny
-               Allow from all
+               Require all granted
        </IfModule>
 
 </Directory>
-
-# "/home/services/httpd/cgi-bin" should be changed to whatever your ScriptAliased
-# CGI directory exists, if you have that configured.
-#
-<Directory "/home/services/httpd/cgi-bin">
-    AllowOverride None
-    Options None
-       <IfModule mod_authz_host.c>
-               Order allow,deny
-               Allow from all
-       </IfModule>
-</Directory>
-
-# Customizable error responses come in three flavors:
-# 1) plain text 2) local redirects 3) external redirects
-#
-# Some examples:
-#ErrorDocument 500 "The server made a boo boo."
-#ErrorDocument 404 /missing.html
-#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
-#ErrorDocument 402 http://www.example.com/subscription_info.html
-#
-
-#
-# EnableMMAP and EnableSendfile: On systems that support it,
-# memory-mapping or the sendfile syscall is used to deliver
-# files.  This usually improves server performance, but must
-# be turned off when serving from networked-mounted
-# filesystems or if support for these functions is otherwise
-# broken on your system.
-#
-#EnableMMAP off
-#EnableSendfile off
-
-# Supplemental configuration
-#
-# The configuration files in the /extra/ directory can be
-# included to add extra features or to modify the default configuration of
-# the server, or you may simply copy their contents here and change as
-# necessary.
-
-# Language settings
-#Include /extra/httpd-languages.conf
-
-# vim:syn=apache