packages: apache1/apache1-httpd.conf, apache1/apache1.spec - add vhosts.d c...

[glen]

Author: glen                         Date: Wed Nov 25 05:57:58 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add vhosts.d configdir support, included after modules config and webapps config; rel 23

---- Files affected:
packages/apache1:
   apache1-httpd.conf (1.18 -> 1.19) , apache1.spec (1.210 -> 1.211) 

---- Diffs:

================================================================
Index: packages/apache1/apache1-httpd.conf
diff -u packages/apache1/apache1-httpd.conf:1.18 packages/apache1/apache1-httpd.conf:1.19
--- packages/apache1/apache1-httpd.conf:1.18	Thu Mar  6 13:25:59 2008
+++ packages/apache1/apache1-httpd.conf	Wed Nov 25 06:57:52 2009
@@ -114,3 +114,23 @@
 		</IfModule>
 	</Directory>
 </IfModule>
+
+# VirtualHost: Allows the daemon to respond to requests for more than one
+# server address, if your server machine is configured to accept IP packets
+# for multiple addresses. This can be accomplished with the ifconfig
+# alias flag, or through kernel patches like VIF.
+
+# Any apache.conf conf directive may go into a VirtualHost command.
+# See also the BindAddress entry.
+
+# 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.example.com
+#	ErrorLog logs/host.example.com-error_log
+#	TransferLog logs/host.example.com-access_log
+</VirtualHost>
+
+Include vhosts.d/*.conf

================================================================
Index: packages/apache1/apache1.spec
diff -u packages/apache1/apache1.spec:1.210 packages/apache1/apache1.spec:1.211
--- packages/apache1/apache1.spec:1.210	Fri Oct 30 18:11:09 2009
+++ packages/apache1/apache1.spec	Wed Nov 25 06:57:52 2009
@@ -31,7 +31,7 @@
 Summary(zh_CN.UTF-8):	Internet 上应用最广泛的 Web 服务程序。
 Name:		apache1
 Version:	1.3.41
-Release:	22
+Release:	23
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/apache_%{version}.tar.gz
@@ -1401,7 +1401,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{logrotate.d,rc.d/init.d,sysconfig} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/{webapps.d,conf.d,vhosts.d} \
 	$RPM_BUILD_ROOT%{httpdir}/html \
 	$RPM_BUILD_ROOT%{_libexecdir} \
 	$RPM_BUILD_ROOT/var/{log/{apache,archive/apache},run/apache}
@@ -1924,6 +1924,7 @@
 %{_sysconfdir}/logs
 %attr(750,root,root) %dir %{_sysconfdir}/conf.d
 %attr(750,root,root) %dir %{_sysconfdir}/webapps.d
+%attr(750,root,root) %dir %{_sysconfdir}/vhosts.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
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/apache
@@ -2493,6 +2494,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.211  2009/11/25 05:57:52  glen
+- add vhosts.d configdir support, included after modules config and webapps config; rel 23
+
 Revision 1.210  2009/10/30 17:11:09  glen
 - release 22
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache1/apache1-httpd.conf?r1=1.18&r2=1.19&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache1/apache1.spec?r1=1.210&r2=1.211&f=u