From: Elan Ruusamäe <glen@pld-linux.org>
Date: Mon, 9 Nov 2009 15:58:37 +0000 (+0000)
Subject: - add vhosts.d configdir support, included after modules config and webapps config... 
X-Git-Tag: auto/ac/apache-2_2_14-9~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache.git;a=commitdiff_plain;h=860c70b0f516cf6c84330fd2995497463b57ce85

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

Changed files:
    apache-httpd.conf -> 1.53
    apache.spec -> 1.586
---

diff --git a/apache-httpd.conf b/apache-httpd.conf
index 98bd299..ae3d356 100644
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -99,10 +99,14 @@ Include webapps.d/*.conf
 # Any apache.conf conf directive may go into a VirtualHost command.
 # See also the BindAddress entry.
 
-#<VirtualHost 1.2.3.4>
-#ServerAdmin webmaster@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@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
diff --git a/apache.spec b/apache.spec
index 5cf24b2..64bdf88 100644
--- a/apache.spec
+++ b/apache.spec
@@ -41,7 +41,7 @@ Summary(ru.UTF-8):	Самый популярный веб-сервер
 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
@@ -1882,7 +1882,7 @@ done
 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
@@ -2298,6 +2298,7 @@ fi
 %{_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