summaryrefslogtreecommitdiffstats
path: root/projectroot
diff options
context:
space:
mode:
authorAlexander Dahl <ada@thorsis.com>2017-08-28 20:08:17 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2017-09-04 15:04:24 +0200
commite7d1bece2b369f3975003cd437bb8fa34808e76b (patch)
tree9f179666d0c8b5bb7899c8da1ff2c9aed701142e /projectroot
parent10472115070ba41d2488eede660dabe4393d0541 (diff)
downloadptxdist-e7d1bece2b369f3975003cd437bb8fa34808e76b.tar.gz
ptxdist-e7d1bece2b369f3975003cd437bb8fa34808e76b.tar.xz
lighttpd: Simplify additional config include
Since version 1.4.40 lighttpd supports file globs for includes. See announcement: https://www.lighttpd.net/2016/7/16/1.4.40/ Signed-off-by: Alexander Dahl <ada@thorsis.com> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'projectroot')
-rw-r--r--projectroot/etc/lighttpd/lighttpd.conf3
1 files changed, 1 insertions, 2 deletions
diff --git a/projectroot/etc/lighttpd/lighttpd.conf b/projectroot/etc/lighttpd/lighttpd.conf
index 86048f003..c6f1e64cf 100644
--- a/projectroot/etc/lighttpd/lighttpd.conf
+++ b/projectroot/etc/lighttpd/lighttpd.conf
@@ -69,5 +69,4 @@ mimetype.assign = (
index-file.names = ( "index.html" )
-include_shell "[ \"$(ls -A conf.d/)\" ] && cat conf.d/*.conf"
-
+include "conf.d/*.conf"