packages: lighttpd/lighttpd.conf, lighttpd/lighttpd.spec - add vhosts.d dir

[glen]

Author: glen                         Date: Tue Dec 22 14:00:34 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add vhosts.d dir

---- Files affected:
packages/lighttpd:
   lighttpd.conf (1.47 -> 1.48) , lighttpd.spec (1.320 -> 1.321) 

---- Diffs:

================================================================
Index: packages/lighttpd/lighttpd.conf
diff -u packages/lighttpd/lighttpd.conf:1.47 packages/lighttpd/lighttpd.conf:1.48
--- packages/lighttpd/lighttpd.conf:1.47	Wed Sep  2 10:06:48 2009
+++ packages/lighttpd/lighttpd.conf	Tue Dec 22 15:00:25 2009
@@ -108,4 +108,7 @@
 #server.kbytes-per-second = 128
 
 # webapps configs
-include_shell "/bin/cat webapps.d/*.conf"
+include_shell "/bin/cat webapps.d/*.conf 2>/dev/null"
+
+# vhosts config
+include_shell "/bin/cat vhosts.d/*.conf 2>/dev/null"

================================================================
Index: packages/lighttpd/lighttpd.spec
diff -u packages/lighttpd/lighttpd.spec:1.320 packages/lighttpd/lighttpd.spec:1.321
--- packages/lighttpd/lighttpd.spec:1.320	Fri Dec 11 22:27:11 2009
+++ packages/lighttpd/lighttpd.spec	Tue Dec 22 15:00:25 2009
@@ -862,7 +862,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_lighttpddir}/{cgi-bin,html},/etc/{logrotate.d,rc.d/init.d,sysconfig,monit}} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/{conf,webapps}.d \
+	$RPM_BUILD_ROOT%{_sysconfdir}/{conf,vhosts,webapps}.d \
 	$RPM_BUILD_ROOT{/var/log/{%{name},archive/%{name}},/var/run/%{name}} \
 	$RPM_BUILD_ROOT%{_datadir}/lighttpd/errordocs \
 	$RPM_BUILD_ROOT/var/lib/lighttpd \
@@ -1068,8 +1068,9 @@
 %defattr(644,root,root,755)
 %doc NEWS README doc/lighttpd.conf doc/*.txt doc/rrdtool-graph.sh PLD-TODO
 %dir %attr(751,root,lighttpd) %{_sysconfdir}
-%dir %attr(750,root,root) %{_sysconfdir}/webapps.d
 %dir %attr(750,root,root) %{_sysconfdir}/conf.d
+%dir %attr(750,root,root) %{_sysconfdir}/vhosts.d
+%dir %attr(750,root,root) %{_sysconfdir}/webapps.d
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mime.types.conf
 %attr(640,root,lighttpd) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.user
@@ -1305,6 +1306,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.321  2009/12/22 14:00:25  glen
+- add vhosts.d dir
+
 Revision 1.320  2009/12/11 21:27:11  blues
 - requires --makepid capable rc-scripts
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd.conf?r1=1.47&r2=1.48&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd.spec?r1=1.320&r2=1.321&f=u