From: Elan Ruusamäe <glen@pld-linux.org>
Date: Wed, 25 Nov 2009 05:57:52 +0000 (+0000)
Subject: - add vhosts.d configdir support, included after modules config and webapps config... 
X-Git-Tag: auto/th/apache1-1_3_41-24~1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=5ed44ee9a3621eb4107b7b48af2095f284b6423f;p=packages%2Fapache1.git

- add vhosts.d configdir support, included after modules config and webapps config; rel 23

Changed files:
    apache1-httpd.conf -> 1.19
    apache1.spec -> 1.211
---

diff --git a/apache1-httpd.conf b/apache1-httpd.conf
index 1bc3603..1f7909d 100644
--- a/apache1-httpd.conf
+++ b/apache1-httpd.conf
@@ -114,3 +114,23 @@ Include webapps.d/*.conf
 		</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@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
diff --git a/apache1.spec b/apache1.spec
index 2910db5..4c7a14b 100644
--- a/apache1.spec
+++ b/apache1.spec
@@ -30,7 +30,7 @@ Summary(uk.UTF-8):	Найпопулярніший Web-Server
 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
@@ -1400,7 +1400,7 @@ rm -f src/modules/standard/mod_rewrite.so
 %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}
@@ -1923,6 +1923,7 @@ fi
 %{_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