packages: apache/apache-httpd.conf, apache/apache.spec - add vhosts.d confi...

[glen]

Author: glen                         Date: Mon Nov  9 15:58:42 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add vhosts.d configdir support, included after modules config and webapps config; rel 9

---- Files affected:
packages/apache:
   apache-httpd.conf (1.52 -> 1.53) , apache.spec (1.585 -> 1.586) 

---- Diffs:

================================================================
Index: packages/apache/apache-httpd.conf
diff -u packages/apache/apache-httpd.conf:1.52 packages/apache/apache-httpd.conf:1.53
--- packages/apache/apache-httpd.conf:1.52	Wed Nov  4 12:39:45 2009
+++ packages/apache/apache-httpd.conf	Mon Nov  9 16:58:37 2009
@@ -99,10 +99,14 @@
 # Any apache.conf conf directive may go into a VirtualHost command.
 # See also the BindAddress entry.
 
-#<VirtualHost 1.2.3.4>
-#ServerAdmin webmaster at host.example.com
-#DocumentRoot /www/docs/host.examp-le.com
-#ServerName host.exampl.com
-#ErrorLog logs/host.example.com-error_log
-#TransferLog logs/host.example.com-access_log
-#</VirtualHost>
+# Setup default vhost (first one defined in config) and include vhosts configuration
+NameVirtualHost 0.0.0.0
+<VirtualHost 0.0.0.0>
+    ServerName localhost
+#	ServerAdmin webmaster at host.example.com
+#	DocumentRoot /www/docs/host.examp-le.com
+#	ErrorLog logs/host.example.com-error_log
+#	TransferLog logs/host.example.com-access_log
+</VirtualHost>
+
+Include vhosts.d/*.conf

================================================================
Index: packages/apache/apache.spec
diff -u packages/apache/apache.spec:1.585 packages/apache/apache.spec:1.586
--- packages/apache/apache.spec:1.585	Mon Nov  9 12:22:20 2009
+++ packages/apache/apache.spec	Mon Nov  9 16:58:37 2009
@@ -42,7 +42,7 @@
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
 Version:	2.2.14
-Release:	8
+Release:	9
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -1883,7 +1883,7 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
 	$RPM_BUILD_ROOT%{_var}/{log/{httpd,archive/httpd},{run,cache}/httpd,lock/mod_dav} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d,vhosts.d} \
 	$RPM_BUILD_ROOT%{_datadir}/cgi-bin
 
 # prefork is default one
@@ -2299,6 +2299,7 @@
 %{_sysconfdir}/logs
 %ghost %{_sysconfdir}/httpd.conf
 %attr(750,root,root) %dir %{_sysconfdir}/conf.d
+%attr(750,root,root) %dir %{_sysconfdir}/vhosts.d
 %attr(750,root,root) %dir %{_sysconfdir}/webapps.d
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_common.conf
@@ -2732,6 +2733,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.586  2009/11/09 15:58:37  glen
+- add vhosts.d configdir support, included after modules config and webapps config; rel 9
+
 Revision 1.585  2009/11/09 11:22:20  blues
 - TODO in spec
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache-httpd.conf?r1=1.52&r2=1.53&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache/apache.spec?r1=1.585&r2=1.586&f=u