summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-02-21 10:32:32 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-25 10:43:06 +0000
commite34b0865c7deee5fac286ac076ebcbd529005247 (patch)
tree12ae4299cf6096ff95a50a9e82ddeab9f63f8863
parent7efebde6ac668524e512c9c897bdff1a255de89b (diff)
downloadpoky-e34b0865c7deee5fac286ac076ebcbd529005247.tar.gz
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 (From OE-Core rev: bd46eeee09e99ae4646a92f5bf5bc3c619e63cde) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd/lighttpd2
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd/lighttpd.service12
-rw-r--r--meta/recipes-extended/lighttpd/lighttpd_1.4.53.bb9
3 files changed, 5 insertions, 18 deletions
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
4DAEMON=/usr/sbin/lighttpd 4DAEMON=/usr/sbin/lighttpd
5NAME=lighttpd 5NAME=lighttpd
6DESC="Lighttpd Web Server" 6DESC="Lighttpd Web Server"
7OPTS="-f /etc/lighttpd.conf" 7OPTS="-f /etc/lighttpd/lighttpd.conf"
8 8
9case "$1" in 9case "$1" in
10 start) 10 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 @@
1[Unit]
2Description=Lightning Fast Webserver With Light System Requirements
3After=network.target
4
5[Service]
6ExecStartPre=@SBINDIR@/lighttpd -t -f @SYSCONFDIR@/lighttpd.conf
7ExecStart=@SBINDIR@/lighttpd -D -f @SYSCONFDIR@/lighttpd.conf
8ExecReload=@BASE_BINDIR@/kill -HUP $MAINPID
9
10[Install]
11WantedBy=multi-user.target
12
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
16 file://index.html.lighttpd \ 16 file://index.html.lighttpd \
17 file://lighttpd.conf \ 17 file://lighttpd.conf \
18 file://lighttpd \ 18 file://lighttpd \
19 file://lighttpd.service \
20 file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \ 19 file://0001-Use-pkg-config-for-pcre-dependency-instead-of-config.patch \
21 " 20 "
22 21
@@ -57,13 +56,13 @@ INITSCRIPT_PARAMS = "defaults 70"
57SYSTEMD_SERVICE_${PN} = "lighttpd.service" 56SYSTEMD_SERVICE_${PN} = "lighttpd.service"
58 57
59do_install_append() { 58do_install_append() {
60 install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav 59 install -d ${D}${sysconfdir}/init.d ${D}${sysconfdir}/lighttpd ${D}${sysconfdir}/lighttpd.d ${D}/www/pages/dav
61 install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d 60 install -m 0755 ${WORKDIR}/lighttpd ${D}${sysconfdir}/init.d
62 install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir} 61 install -m 0644 ${WORKDIR}/lighttpd.conf ${D}${sysconfdir}/lighttpd
63 install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html 62 install -m 0644 ${WORKDIR}/index.html.lighttpd ${D}/www/pages/index.html
64 63
65 install -d ${D}${systemd_unitdir}/system 64 install -d ${D}${systemd_unitdir}/system
66 install -m 0644 ${WORKDIR}/lighttpd.service ${D}${systemd_unitdir}/system 65 install -m 0644 ${S}/doc/systemd/lighttpd.service ${D}${systemd_unitdir}/system
67 sed -i -e 's,@SBINDIR@,${sbindir},g' \ 66 sed -i -e 's,@SBINDIR@,${sbindir},g' \
68 -e 's,@SYSCONFDIR@,${sysconfdir},g' \ 67 -e 's,@SYSCONFDIR@,${sysconfdir},g' \
69 -e 's,@BASE_BINDIR@,${base_bindir},g' \ 68 -e 's,@BASE_BINDIR@,${base_bindir},g' \
@@ -75,7 +74,7 @@ do_install_append() {
75 74
76FILES_${PN} += "${sysconfdir} /www" 75FILES_${PN} += "${sysconfdir} /www"
77 76
78CONFFILES_${PN} = "${sysconfdir}/lighttpd.conf" 77CONFFILES_${PN} = "${sysconfdir}/lighttpd/lighttpd.conf"
79 78
80PACKAGES_DYNAMIC += "^lighttpd-module-.*" 79PACKAGES_DYNAMIC += "^lighttpd-module-.*"
81 80