[7/7] lighttpd: Fixed sysvinit and split into overridable conf package

Submitted by Kim Bøndergaard on Sept. 22, 2014, 6:09 a.m.

Details

Message ID 474625899e021214d58e991df34049047e1799e0.1411365801.git.kibo@prevas.dk
State Under Review
Delegated to: Kim
Headers show

Commit Message

Kim Bøndergaard Sept. 22, 2014, 6:09 a.m.
From: Kim Bøndergaard <kim@fam-boendergaard.dk>

---
 recipes/lighttpd/lighttpd.inc | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/recipes/lighttpd/lighttpd.inc b/recipes/lighttpd/lighttpd.inc
index 8b55816..bbafd3c 100644
--- a/recipes/lighttpd/lighttpd.inc
+++ b/recipes/lighttpd/lighttpd.inc
@@ -81,10 +81,11 @@  DEPENDS_SSL:USE_lighttpd_ssl = "libssl libcrypto"
 DEPENDS += "${DEPENDS_SSL}"
 RDEPENDS_${PN} += "${DEPENDS_SSL}"
 
+RECIPE_FLAGS += "lighttpd_sysvinit_start"
 DEFAULT_USE_lighttpd_sysvinit_start = "70"
 DEFAULT_USE_lighttpd_sysvinit_stop = "0"
 SYSVINIT_SCRIPT_lighttpd = "lighttpd"
-do_install[postfuncs] += " do_install_lighttpd_extra"
+do_install[postfuncs] =+ " do_install_lighttpd_extra"
 do_install_lighttpd_extra() {
     install -d ${D}${sysconfdir}/init.d \
 	${D}/www/logs ${D}/www/pages/dav ${D}/www/var
@@ -93,7 +94,13 @@  do_install_lighttpd_extra() {
     install -m 0644 ${SRCDIR}/index.html ${D}/www/pages/
 }
 
-FILES_${PN} += "${sysconfdir} /www"
+PACKAGES =+ "${PN}-conf"
+FILES_${PN} += "${sysconfdir}"
 FILES_${PN} += "${libdir}/mod_*"
+FILES_${PN} += "/www"
+FILES_${PN}-conf = "${sysconfdir}/lighttpd.conf"
+FILES_${PN}-conf += "/www/pages/index.html"
 
 RDEPENDS_${PN} += "libc libgcc libdl libm"
+
+