From: Alexander Dahl <ada@thorsis.com>
To: ptxdist@pengutronix.de
Cc: Andreas Geisenhainer <Andreas.Geisenhainer@atsonline.de>,
Clemens Gruber <clemens.gruber@pqgruber.com>,
Michael Olbrich <m.olbrich@pengutronix.de>
Subject: [ptxdist] [PATCH v2 3/4] lighttpd: Simplify additional config include
Date: Wed, 23 Aug 2017 12:36:41 +0200 [thread overview]
Message-ID: <1503484602-31788-4-git-send-email-ada@thorsis.com> (raw)
In-Reply-To: <1503484602-31788-1-git-send-email-ada@thorsis.com>
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>
---
projectroot/etc/lighttpd/lighttpd.conf | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/projectroot/etc/lighttpd/lighttpd.conf b/projectroot/etc/lighttpd/lighttpd.conf
index 86048f0..c6f1e64 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"
--
2.1.4
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
next prev parent reply other threads:[~2017-08-23 10:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-23 10:36 [ptxdist] [PATCH v2 0/4] lighttpd: Update and suggestions from last year Alexander Dahl
2017-08-23 10:36 ` [ptxdist] [PATCH v2 1/4] lighttpd: Ugprade from 1.4.39 to 1.4.45 Alexander Dahl
2017-08-25 7:38 ` Michael Olbrich
2017-08-25 8:05 ` Alexander Dahl
2017-08-26 15:46 ` Alexander Dahl
2017-08-28 9:34 ` Michael Olbrich
2017-08-23 10:36 ` [ptxdist] [PATCH v2 2/4] lighttpd: Rename memcache option to memcached Alexander Dahl
2017-08-23 10:36 ` Alexander Dahl [this message]
2017-08-23 10:36 ` [ptxdist] [PATCH v2 4/4] lighttpd: Install mime.conf and remove hardcoded values Alexander Dahl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1503484602-31788-4-git-send-email-ada@thorsis.com \
--to=ada@thorsis.com \
--cc=Andreas.Geisenhainer@atsonline.de \
--cc=clemens.gruber@pqgruber.com \
--cc=m.olbrich@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox