From 126c0d6aa6d7f54808936b47737eaa422849d36a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 18 Sep 2018 10:26:11 +0300 Subject: [PATCH] fix include_shell non-zero exit status causing startup failure see: http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2018-September/025604.html --- lighttpd.conf | 11 +++++++---- lighttpd.spec | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lighttpd.conf b/lighttpd.conf index 75079f7..04973ff 100644 --- a/lighttpd.conf +++ b/lighttpd.conf @@ -1,6 +1,7 @@ # lighttpd configuration file. -include_shell "for f in conf.d/*.conf ; do [ -f \"$f\" ] && echo \"include \\"$f\\"\" ; done" +# modules config +include_shell "for f in conf.d/*.conf; do [ -f \"$f\" ] && echo \"include \\"$f\\"\"; done; exit 0" ## a static document-root, for virtual-hosting take look at the ## server.virtual-* options @@ -180,8 +181,10 @@ server.groupname = "lighttpd" ## #connection.kbytes-per-second = 32 -# webapps configs -include_shell "for f in webapps.d/*.conf ; do [ -f \"$f\" ] && echo \"include \\"$f\\"\" ; done" +# webapps config +include_shell "for f in webapps.d/*.conf; do [ -f \"$f\" ] && echo \"include \\"$f\\"\"; done; exit 0" # vhosts config -include_shell "for f in vhosts.d/*.conf ; do [ -f \"$f\" ] && echo \"include \\"$f\\"\" ; done" +include_shell "for f in vhosts.d/*.conf; do [ -f \"$f\" ] && echo \"include \\"$f\\"\"; done; exit 0" + +## EOF diff --git a/lighttpd.spec b/lighttpd.spec index 861fc11..add1b3e 100644 --- a/lighttpd.spec +++ b/lighttpd.spec @@ -42,7 +42,7 @@ Summary: Fast and light HTTP server Summary(pl.UTF-8): Szybki i lekki serwer HTTP Name: lighttpd Version: 1.4.50 -Release: 3 +Release: 4 License: BSD Group: Networking/Daemons/HTTP Source0: https://download.lighttpd.net/lighttpd/releases-1.4.x/%{name}-%{version}.tar.xz -- 2.44.0