aboutsummaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-httpd
diff options
context:
space:
mode:
authorNick Glynn <n.s.glynn@gmail.com>2013-10-14 15:10:54 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2013-10-28 16:31:38 +0000
commit603c635feb211e7c092a39e73784303859bfdd47 (patch)
treec10f2178af865a85deb94af14dd8fcc794cc9b21 /meta-webserver/recipes-httpd
parentbeee26305246a75b3e0c75828ba6c660abee6392 (diff)
downloadmeta-openembedded-contrib-603c635feb211e7c092a39e73784303859bfdd47.tar.gz
meta-openembedded-contrib-603c635feb211e7c092a39e73784303859bfdd47.tar.bz2
meta-openembedded-contrib-603c635feb211e7c092a39e73784303859bfdd47.zip
sthttpd: add systemd service
Signed-off-by: Nick Glynn <n.s.glynn@gmail.com> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta-webserver/recipes-httpd')
-rw-r--r--meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.service10
-rw-r--r--meta-webserver/recipes-httpd/sthttpd/sthttpd_2.26.4.bb11
2 files changed, 20 insertions, 1 deletions
diff --git a/meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.service b/meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.service
new file mode 100644
index 0000000000..e2dae61fd0
--- /dev/null
+++ b/meta-webserver/recipes-httpd/sthttpd/sthttpd/thttpd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Tiny/Turbo/Throttling Web Server
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/thttpd -d @@SRVDIR -c cgi-bin/* -i /var/run/thttpd.pid
+PIDFile=/var/run/thttpd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.26.4.bb b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.26.4.bb
index ba2f047a98..0abd13169e 100644
--- a/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.26.4.bb
+++ b/meta-webserver/recipes-httpd/sthttpd/sthttpd_2.26.4.bb
@@ -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://thttpd.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,11 +22,19 @@ 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}/thttpd.service ${D}${systemd_unitdir}/system
+ sed -i 's!/usr/sbin/!${sbindir}/!g' ${D}${systemd_unitdir}/system/thttpd.service
+ sed -i 's!/var/!${localstatedir}/!g' ${D}${systemd_unitdir}/system/thttpd.service
+ sed -i -e 's,@@SRVDIR,${servicedir}/www,g' ${D}${systemd_unitdir}/system/thttpd.service
}
INITSCRIPT_NAME = "thttpd"
INITSCRIPT_PARAMS = "defaults"
+SYSTEMD_SERVICE_${PN} = "thttpd.service"
+
FILES_${PN} += "${servicedir}"
FILES_${PN}-dbg += "${servicedir}/www/cgi-bin/.debug"