- remove DefaultType

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

diff --git a/apache-httpd.conf b/apache-httpd.conf
index ec2c372f7a3dad99f271e0cd9ce6f8340afc6b20..7992a32c52277a2af4a9c64a710bf7bd0777261e 100644 (file)
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -1,4 +1,3 @@
-# $Id: apache-httpd.conf,v 1.58 2011/10/25 09:40:41 psz Exp $
 #
 # This is the main Apache HTTP server configuration file.
 # It contains the configuration directives that give the server its instructions.
@@ -8,9 +7,9 @@
 # In particular, see
 # <URL:http://httpd.apache.org/docs/2.2/mod/directives.html>
 # for a discussion of each configuration directive.
-
 ServerRoot "/etc/httpd"
-DefaultType text/plain
+
+LoadModule unixd_module modules/mod_unixd.so
 
 # 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 +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.
@@ -101,7 +100,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 +108,4 @@ NameVirtualHost *:80
 #      TransferLog logs/host.example.com-access_log
 </VirtualHost>
 
-Include vhosts.d/*.conf
+IncludeOptional vhosts.d/*.conf