[Fedora-directory-commits] adminserver/admserv/cfgstuff httpd.conf.in, 1.5, 1.6

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/adminserver/admserv/cfgstuff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7318/admserv/cfgstuff

Modified Files:
	httpd.conf.in 
Log Message:
Resolves: #203999
Summary: HP-UX: mime.types is not in /etc. (comment #5)
Description: Introducing httpdconfdir to httpd.conf.in, which is going to be 
replaced with the parent directory of the httpd.conf full-path if the 
directory has mime.types   (for HP-UX).  Otherwise, check /etc if mime.types 
is located in the directory (for RHELs and Solaris).	If mime.types is not 
found in the both directories, issue an error.



Index: httpd.conf.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cfgstuff/httpd.conf.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- httpd.conf.in	21 May 2007 15:52:26 -0000	1.5
+++ httpd.conf.in	31 Jul 2007 00:19:22 -0000	1.6
@@ -277,7 +277,7 @@
 # TypesConfig describes where the mime.types file (or equivalent) is
 # to be found.
 #
-TypesConfig /etc/mime.types
+TypesConfig @httpdconfdir@/mime.types
 
 #
 # DefaultType is the default MIME type the server will use for a document