From bd46eeee09e99ae4646a92f5bf5bc3c619e63cde Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Thu, 21 Feb 2019 10:32:32 +0200 Subject: lighttpd: Use the upstream lighttpd.service We shipped an old version that was missing several fixes. A minor incompatibility is that this moves /etc/lighttpd.conf -> /etc/lighttpd/lighttpd.conf Signed-off-by: Adrian Bunk Signed-off-by: Richard Purdie --- meta/recipes-extended/lighttpd/lighttpd/lighttpd | 2 +- meta/recipes-extended/lighttpd/lighttpd/lighttpd.service | 12 ------------ meta/recipes-extended/lighttpd/lighttpd_1.4.53.bb | 9 ++++----- 3 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 meta/recipes-extended/lighttpd/lighttpd/lighttpd.service (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/lighttpd/lighttpd/lighttpd b/meta/recipes-extended/lighttpd/lighttpd/lighttpd index bf89a60b7d..82fbaa523b 100644 --- a/meta/recipes-extended/lighttpd/lighttpd/lighttpd +++ b/meta/recipes-extended/lighttpd/lighttpd/lighttpd @@ -4,7 +4,7 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin DAEMON=/usr/sbin/lighttpd NAME=lighttpd DESC="Lighttpd Web Server" -OPTS="-f /etc/lighttpd.conf" +OPTS="-f /etc/lighttpd/lighttpd.conf" case "$1" in start) diff --git a/meta/recipes-extended/lighttpd/lighttpd/lighttpd.service b/meta/recipes-extended/lighttpd/lighttpd/lighttpd.service deleted file mode 100644 index 66a907aa17..0000000000 --- a/meta/recipes-extended/lighttpd/lighttpd/lighttpd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Lightning Fast Webserver With Light System Requirements -After=network.target - -[Service] -ExecStartPre=@SBINDIR@/lighttpd -t -f @SYSCONFDIR@/lighttpd.conf -ExecStart=@SBINDIR@/lighttpd -D -f @SYSCONFDIR@/lighttpd.conf -ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target - diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.53.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.53.bb index a58faa17be..a0b350f358 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.53.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.53.bb @@ -16,7 +16,6 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t file://index.html.lighttpd \ file://lighttpd.conf \ file://lighttpd \ - file://lighttpd.service \ file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ " @@ -57,13 +56,13 @@ INITSCRIPT_PARAMS = "defaults 70" SYSTEMD_SERVICE_${PN} = "lighttpd.service" do_install_append() { - install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav + install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system + install -m 0644 ${S}/doc/systemd/lighttpd.service ${D}${systemd_unitdir}/system sed -i -e 's,@SBINDIR@,${sbindir},g' \ -e 's,@SYSCONFDIR@,${sysconfdir},g' \ -e 's,@BASE_BINDIR@,${base_bindir},g' \ @@ -75,7 +74,7 @@ do_install_append() { FILES_${PN} += "${sysconfdir} /www" -CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf" +CONFFILES_${PN} = "${sysconfdir}/lighttpd/lighttpd.conf" PACKAGES_DYNAMIC += "^lighttpd-module-.*" -- cgit 1.2.3-korg