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

diff --git a/lighttpd.conf b/lighttpd.conf
index 75079f7cfccae3a9b3f03e8e00fe4fd6fdf71155..04973ff445b31f3a191048935b579288fc80d85e 100644 (file)
--- 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 861fc118e485d92b8c650958210b5f01a46d877a..add1b3ed5e15ea311928274e4fbc49e9db74e478 100644 (file)
--- 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