- mod_authn/z_core provide mod_authn/z_default to smooth upgrade

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

diff --git a/apache-httpd.conf b/apache-httpd.conf
index ec2c372f7a3dad99f271e0cd9ce6f8340afc6b20..98f483aa17c99c8868c88d0354309ae263913dbc 100644 (file)
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -10,7 +10,7 @@
 # for a discussion of each configuration directive.
 
 ServerRoot "/etc/httpd"
-DefaultType text/plain
+DefaultType none
 
 # 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
@@ -67,10 +67,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.
@@ -101,7 +101,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 +109,4 @@ NameVirtualHost *:80
 #      TransferLog logs/host.example.com-access_log
 </VirtualHost>
 
-Include vhosts.d/*.conf
+IncludeOptional vhosts.d/*.conf