Author: jajcus Date: Tue May 25 06:45:54 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- change the way config files are included, so in case of error the error
messages show exact location of the problem
---- Files affected:
packages/lighttpd:
lighttpd.conf (1.48 -> 1.49)
---- Diffs:
================================================================
Index: packages/lighttpd/lighttpd.conf
diff -u packages/lighttpd/lighttpd.conf:1.48
packages/lighttpd/lighttpd.conf:1.49
--- packages/lighttpd/lighttpd.conf:1.48 Tue Dec 22 15:00:25 2009
+++ packages/lighttpd/lighttpd.conf Tue May 25 08:45:49 2010
@@ -1,7 +1,7 @@
# $Id$
# lighttpd configuration file.
-include_shell "/bin/cat conf.d/*.conf"
+include_shell "for f in conf.d/*.conf ; do [ -f \"$f\" ] && echo \"include
\\"$f\\"\" ; done"
## a static document-root, for virtual-hosting take look at the
## server.virtual-* options
@@ -108,7 +108,7 @@
#server.kbytes-per-second = 128
# webapps configs
-include_shell "/bin/cat webapps.d/*.conf 2>/dev/null"
+include_shell "for f in webapps.d/*.conf ; do [ -f \"$f\" ] && echo \"include
\\"$f\\"\" ; done"
# vhosts config
-include_shell "/bin/cat vhosts.d/*.conf 2>/dev/null"
+include_shell "for f in vhosts.d/*.conf ; do [ -f \"$f\" ] && echo \"include
\\"$f\\"\" ; done"
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd.conf?r1=1.48&r2=1.49&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
