diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2016-08-20 19:47:06 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2016-09-02 11:25:15 +0200 |
| commit | ae449fbd75478f0cdfe6fe9abc3998aee9ed7574 (patch) | |
| tree | c761699b768855778828cfe7c1df42240e9e4491 /projectroot | |
| parent | 30cee80a0c9aa74a197051bced83aa3df40f0086 (diff) | |
| download | ptxdist-ae449fbd75478f0cdfe6fe9abc3998aee9ed7574.tar.gz ptxdist-ae449fbd75478f0cdfe6fe9abc3998aee9ed7574.tar.xz | |
lighttpd: create /etc/lighttpd/conf.d in any case
Otherwhise 'systemctl status lighttpd' shows that include_shell in
lighttpd.conf tries to glob in a non-existing directory.
While being there, test if there are *.conf files before including them,
which also would give an error.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'projectroot')
| -rw-r--r-- | projectroot/etc/lighttpd/lighttpd.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/projectroot/etc/lighttpd/lighttpd.conf b/projectroot/etc/lighttpd/lighttpd.conf index 34468ea97..86048f003 100644 --- a/projectroot/etc/lighttpd/lighttpd.conf +++ b/projectroot/etc/lighttpd/lighttpd.conf @@ -69,5 +69,5 @@ mimetype.assign = ( index-file.names = ( "index.html" ) -include_shell "cat conf.d/*.conf" +include_shell "[ \"$(ls -A conf.d/)\" ] && cat conf.d/*.conf" |