[meta-webserver,2/2] sthttpd: Added systemd service to recipe
Submitted by Nick Glynn on Oct. 10, 2013, 9:45 p.m.
|
Patch ID: 59631
Details
Commit Message
new file mode 100644
@@ -0,0 +1,10 @@
+[Unit]
+Description=Tiny/Turbo/Throttling Web Server
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/thttpd -d /srv/www -c cgi-bin/* -i /var/run/thttpd.pid
+PIDFile=/var/run/thttpd.pid
+
+[Install]
+WantedBy=multi-user.target
@@ -5,6 +5,7 @@ LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://src/thttpd.c;beginline=1;endline=26;md5=0c5762c2c34dcbe9eb18815516502872"
SRC_URI = "http://opensource.dyc.edu/pub/sthttpd/sthttpd-${PV}.tar.gz \
+ file://sthttpd.service \
file://init"
SRC_URI[md5sum] = "e645a85a97d3cb883011a35bc2211815"
@@ -12,7 +13,7 @@ SRC_URI[sha256sum] = "78e87979140cbda123c81b4051552242dbbffb5dec1a17e5f95ec4826b
S = "${WORKDIR}/sthttpd-${PV}"
-inherit autotools update-rc.d
+inherit autotools update-rc.d systemd
EXTRA_OEMAKE += "'WEBDIR=${servicedir}/www'"
@@ -21,6 +22,9 @@ do_install_append () {
install -c -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/thttpd
sed -i -e 's,@@SRVDIR,${servicedir}/www,g' ${D}${sysconfdir}/init.d/thttpd
sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${sysconfdir}/init.d/thttpd
+
+ install -d ${D}${systemd_unitdir}/system
+ install -m 0644 ${WORKDIR}/sthttpd.service ${D}${systemd_unitdir}/system
}
INITSCRIPT_NAME = "thttpd"
@@ -28,4 +32,7 @@ INITSCRIPT_PARAMS = "defaults"
FILES_${PN} += "${servicedir}"
FILES_${PN}-dbg += "${servicedir}/www/cgi-bin/.debug"
-
+RPROVIDES_${PN} += "${PN}-systemd"
+RREPLACES_${PN} += "${PN}-systemd"
+RCONFLICTS_${PN} += "${PN}-systemd"
+SYSTEMD_SERVICE_${PN} = "sthttpd.service"
Recipe updated with a systemd service file to remove need for sysvinit compatibility Signed-off-by: Nick Glynn <n.s.glynn@gmail.com> --- meta-webserver/recipes-httpd/sthttpd/sthttpd/sthttpd.service | 10 ++++++++++ meta-webserver/recipes-httpd/sthttpd/sthttpd_2.26.4.bb | 11 +++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 meta-webserver/recipes-httpd/sthttpd/sthttpd/sthttpd.service