packages: apache/apache-httpd.conf - The DefaultType directive no longer ha...

[adamg]

Author: adamg                        Date: Sat Feb 25 22:51:44 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- The DefaultType directive no longer has any effect
- include -> includeoptional

---- Files affected:
packages/apache:
   apache-httpd.conf (1.58 -> 1.59) 

---- Diffs:

================================================================
Index: packages/apache/apache-httpd.conf
diff -u packages/apache/apache-httpd.conf:1.58 packages/apache/apache-httpd.conf:1.59
--- packages/apache/apache-httpd.conf:1.58	Tue Oct 25 11:40:41 2011
+++ packages/apache/apache-httpd.conf	Sat Feb 25 23:51:39 2012
@@ -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
@@ -67,10 +66,10 @@
 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.
@@ -110,4 +109,4 @@
 #	TransferLog logs/host.example.com-access_log
 </VirtualHost>
 
-Include vhosts.d/*.conf
+IncludeOptional vhosts.d/*.conf
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache-httpd.conf?r1=1.58&r2=1.59&f=u