Hiawatha: update to 9.0, add systemd support

Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Jack Mitchell 2013-04-18 11:20:20 +00:00 committed by Martin Jansa
parent 6b0aa8daf1
commit e1a4953e29
2 changed files with 30 additions and 5 deletions

View File

@ -0,0 +1,16 @@
[Unit]
Description=Hiawatha Web Server
After=network.target remote-fs.target nss-lookup.target
[Service]
Type=simple
SyslogIdentifier=hiawatha
ExecStartPre=/usr/sbin/hiawatha -k ; /usr/sbin/wigwam
ExecStart= /usr/sbin/hiawatha -d
TimeoutSec=10
#(doesn't like this setting. Can't find files) PrivateTmp=true
LimitNOFILE=infinity
CapabilityBoundingSet=CAP_NET_BIND_SERVICE CAP_CHOWN CAP_DAC_OVERRIDE CAP_FOWNER CAP_FSETID CAP_SETGID CAP_SETUID
[Install]
WantedBy=multi-user.target

View File

@ -7,16 +7,19 @@ DEPENDS = "libxml2 libxslt"
SECTION = "net"
SRC_URI = "http://hiawatha-webserver.org/files/${PN}-${PV}.tar.gz \
file://hiawatha-init "
file://hiawatha-init \
file://hiawatha.service "
SRC_URI[md5sum] = "5def93779bbc10a021796abd3609caf7"
SRC_URI[sha256sum] = "2583d8e7f48ddc6cdedc27bb51d3e130679fc2f4411622bae9ddce3ef965d063"
inherit cmake update-rc.d
SRC_URI[md5sum] = "8abc4f85dbb9a76ed66e7f35de520064"
SRC_URI[sha256sum] = "5e40119afb050b11737250c08d89ac7ba7472645738a48c06aa79979a19729fc"
INITSCRIPT_NAME = "hiawatha"
INITSCRIPT_PARAMS = "defaults 70"
SYSTEMD_SERVICE_${PN} = "hiawatha.service"
inherit cmake update-rc.d systemd
EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \
-DENABLE_CACHE=OFF \
-DENABLE_DEBUG=OFF \
@ -44,6 +47,12 @@ do_install_append() {
# configure php-fcgi to have a working configuration
# by default if php is installed
echo "Server = ${bindir}/php-cgi ; 2 ; 127.0.0.1:2005 ; nobody:nobody ; ${sysconfdir}/php/hiawatha-php5/php.ini" >> ${D}${sysconfdir}/hiawatha/php-fcgi.conf
if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then
install -d ${D}/${systemd_unitdir}/system
install -m 644 ${WORKDIR}/hiawatha.service ${D}/${systemd_unitdir}/system
fi
}
CONFFILES_${PN} = " \