From e1a4953e29ae1d605365b895d430ad622c605059 Mon Sep 17 00:00:00 2001 From: Jack Mitchell Date: Thu, 18 Apr 2013 11:20:20 +0000 Subject: Hiawatha: update to 9.0, add systemd support Signed-off-by: Jack Mitchell Signed-off-by: Martin Jansa --- .../recipes-httpd/hiawatha/files/hiawatha.service | 16 ++++++ .../recipes-httpd/hiawatha/hiawatha_8.8.1.bb | 55 ------------------- .../recipes-httpd/hiawatha/hiawatha_9.0.bb | 64 ++++++++++++++++++++++ 3 files changed, 80 insertions(+), 55 deletions(-) create mode 100644 meta-webserver/recipes-httpd/hiawatha/files/hiawatha.service delete mode 100644 meta-webserver/recipes-httpd/hiawatha/hiawatha_8.8.1.bb create mode 100644 meta-webserver/recipes-httpd/hiawatha/hiawatha_9.0.bb diff --git a/meta-webserver/recipes-httpd/hiawatha/files/hiawatha.service b/meta-webserver/recipes-httpd/hiawatha/files/hiawatha.service new file mode 100644 index 0000000000..26cb8d03d0 --- /dev/null +++ b/meta-webserver/recipes-httpd/hiawatha/files/hiawatha.service @@ -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 diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.8.1.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.8.1.bb deleted file mode 100644 index a7299708d6..0000000000 --- a/meta-webserver/recipes-httpd/hiawatha/hiawatha_8.8.1.bb +++ /dev/null @@ -1,55 +0,0 @@ -DESCRIPTION = "Lightweight secure web server" -HOMEPAGE = "http://www.hiawatha-webserver.org" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" -DEPENDS = "libxml2 libxslt" - -SECTION = "net" - -SRC_URI = "http://hiawatha-webserver.org/files/${PN}-${PV}.tar.gz \ - file://hiawatha-init " - -SRC_URI[md5sum] = "5def93779bbc10a021796abd3609caf7" -SRC_URI[sha256sum] = "2583d8e7f48ddc6cdedc27bb51d3e130679fc2f4411622bae9ddce3ef965d063" - -inherit cmake update-rc.d - -INITSCRIPT_NAME = "hiawatha" -INITSCRIPT_PARAMS = "defaults 70" - -EXTRA_OECMAKE = " -DENABLE_IPV6=OFF \ - -DENABLE_CACHE=OFF \ - -DENABLE_DEBUG=OFF \ - -DENABLE_SSL=OFF \ - -DENABLE_TOOLKIT=OFF \ - -DENABLE_CHROOT=OFF \ - -DENABLE_XSLT=ON \ - -DENABLE_TOMAHAWK=OFF \ - -DCMAKE_INSTALL_MANDIR=${mandir} \ - -DCMAKE_INSTALL_BINDIR=${bindir} \ - -DCMAKE_INSTALL_SBINDIR=${sbindir} \ - -DCMAKE_INSTALL_SYSCONFDIR=${sysconfdir} \ - -DCMAKE_INSTALL_LIBDIR=${libdir} \ - -DLOG_DIR=/var/log/hiawatha \ - -DPID_DIR=/var/run \ - -DWEBROOT_DIR=/var/www/hiawatha \ - -DWORK_DIR=/var/lib/hiawatha " - -do_install_append() { - # Copy over init script and sed in the correct sbin path - sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init - mkdir -p ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/hiawatha-init ${D}${sysconfdir}/init.d/hiawatha - - # 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 -} - -CONFFILES_${PN} = " \ - ${sysconfdir}/hiawatha/cgi-wrapper.conf \ - ${sysconfdir}/hiawatha/hiawatha.conf \ - ${sysconfdir}/hiawatha/index.xslt \ - ${sysconfdir}/hiawatha/mimetype.conf \ - ${sysconfdir}/hiawatha/php-fcgi.conf \ -" diff --git a/meta-webserver/recipes-httpd/hiawatha/hiawatha_9.0.bb b/meta-webserver/recipes-httpd/hiawatha/hiawatha_9.0.bb new file mode 100644 index 0000000000..ac2155813f --- /dev/null +++ b/meta-webserver/recipes-httpd/hiawatha/hiawatha_9.0.bb @@ -0,0 +1,64 @@ +DESCRIPTION = "Lightweight secure web server" +HOMEPAGE = "http://www.hiawatha-webserver.org" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=751419260aa954499f7abaabaa882bbe" +DEPENDS = "libxml2 libxslt" + +SECTION = "net" + +SRC_URI = "http://hiawatha-webserver.org/files/${PN}-${PV}.tar.gz \ + file://hiawatha-init \ + file://hiawatha.service " + +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 \ + -DENABLE_SSL=OFF \ + -DENABLE_TOOLKIT=OFF \ + -DENABLE_CHROOT=OFF \ + -DENABLE_XSLT=ON \ + -DENABLE_TOMAHAWK=OFF \ + -DCMAKE_INSTALL_MANDIR=${mandir} \ + -DCMAKE_INSTALL_BINDIR=${bindir} \ + -DCMAKE_INSTALL_SBINDIR=${sbindir} \ + -DCMAKE_INSTALL_SYSCONFDIR=${sysconfdir} \ + -DCMAKE_INSTALL_LIBDIR=${libdir} \ + -DLOG_DIR=/var/log/hiawatha \ + -DPID_DIR=/var/run \ + -DWEBROOT_DIR=/var/www/hiawatha \ + -DWORK_DIR=/var/lib/hiawatha " + +do_install_append() { + # Copy over init script and sed in the correct sbin path + sed -i 's,sed_sbin_path,${sbindir},' ${WORKDIR}/hiawatha-init + mkdir -p ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/hiawatha-init ${D}${sysconfdir}/init.d/hiawatha + + # 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} = " \ + ${sysconfdir}/hiawatha/cgi-wrapper.conf \ + ${sysconfdir}/hiawatha/hiawatha.conf \ + ${sysconfdir}/hiawatha/index.xslt \ + ${sysconfdir}/hiawatha/mimetype.conf \ + ${sysconfdir}/hiawatha/php-fcgi.conf \ +" -- cgit v1.2.3-54-g00ecf