- add vhosts.d dir

Changed files:
    lighttpd.conf -> 1.48
    lighttpd.spec -> 1.321

diff --git a/lighttpd.conf b/lighttpd.conf
index 1922d5acb2c399a0277b7a8e0ce456130479926e..a797920c2999ee9fe8611462f9d745ff723a0fdd 100644 (file)
--- a/lighttpd.conf
+++ b/lighttpd.conf
@@ -108,4 +108,7 @@ server.groupname           = "lighttpd"
 #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"

diff --git a/lighttpd.spec b/lighttpd.spec
index 14740f79ef4ff43daa8c63f90cb809815aa3a14d..9fb7444f4f2a3b95c8b7fa931b39771ff9610b8b 100644 (file)
--- a/lighttpd.spec
+++ b/lighttpd.spec
@@ -861,7 +861,7 @@ fi
 %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 \
@@ -1067,8 +1067,9 @@ fi
 %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