- mod_authz_host += R: apache(mod_access_compat) [to ease upgrade from 2.2]

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

diff --git a/apache-httpd.conf b/apache-httpd.conf
index e28647d03754c7bd19353243ffe3628608d1dc3d..aed7d549351f1177b6f002464182b671e9fb0284 100644 (file)
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -10,7 +10,6 @@
 # for a discussion of each configuration directive.
 
 ServerRoot "/etc/httpd"
-DefaultType text/plain
 
 # User/Group: The name (or #number) of the user/group to run httpd as.
 # It is usually good practice to create a dedicated user and group for
@@ -59,7 +58,7 @@ MaxKeepAliveRequests 100
 KeepAliveTimeout 5
 UseCanonicalName Off
 AccessFileName .htaccess
-ServerTokens Full
+ServerTokens Prod
 ServerSignature On
 HostnameLookups Off
 #AddDefaultCharset UTF-8
@@ -67,10 +66,10 @@ HostnameLookups Off
 TraceEnable Off
 
 # Include other modules and packages config.
-Include conf.d/*.conf
+IncludeOptional conf.d/*.conf
 
 # Include webapps config
-Include webapps.d/*.conf
+IncludeOptional webapps.d/*.conf
 
 <IfModule alias_module>
        # ScriptAlias: This controls which directories contain server scripts.
@@ -86,8 +85,7 @@ Include webapps.d/*.conf
                AllowOverride None
                Options None
                <IfModule mod_authz_host.c>
-                       Order allow,deny
-                       Allow from all
+                       Require all granted
                </IfModule>
        </Directory>
 </IfModule>
@@ -101,7 +99,6 @@ Include webapps.d/*.conf
 # See also the BindAddress entry.
 
 # Setup default vhost (first one defined in config) and include vhosts configuration
-NameVirtualHost *:80
 <VirtualHost *:80>
     ServerName localhost
 #      ServerAdmin webmaster@host.example.com
@@ -110,4 +107,4 @@ NameVirtualHost *:80
 #      TransferLog logs/host.example.com-access_log
 </VirtualHost>
 
-Include vhosts.d/*.conf
+IncludeOptional vhosts.d/*.conf