From 74b25f04468aeac2ee5e11aa3ca037e1dbebe70c Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Sat, 12 Jul 2014 00:37:57 -0600 Subject: monkey: new v1.5.1 release. This patch add the minor release fix of Monkey HTTP Server v1.5.1. It fixes some problems when switching user when started as root. Signed-off-by: Eduardo Silva Signed-off-by: Martin Jansa --- .../recipes-httpd/monkey/files/monkey.init | 34 +++++++++++++++ .../recipes-httpd/monkey/files/monkey.service | 12 ++++++ .../recipes-httpd/monkey/monkey_1.5.0.bb | 36 ---------------- .../recipes-httpd/monkey/monkey_1.5.1.bb | 50 ++++++++++++++++++++++ 4 files changed, 96 insertions(+), 36 deletions(-) create mode 100644 meta-webserver/recipes-httpd/monkey/files/monkey.init create mode 100644 meta-webserver/recipes-httpd/monkey/files/monkey.service delete mode 100644 meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb create mode 100644 meta-webserver/recipes-httpd/monkey/monkey_1.5.1.bb (limited to 'meta-webserver') diff --git a/meta-webserver/recipes-httpd/monkey/files/monkey.init b/meta-webserver/recipes-httpd/monkey/files/monkey.init new file mode 100644 index 0000000000..40b21182e1 --- /dev/null +++ b/meta-webserver/recipes-httpd/monkey/files/monkey.init @@ -0,0 +1,34 @@ +#!/bin/sh + +PATH=/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/bin/monkey +NAME=monkey +DESC="Monkey HTTP Server" +OPTS="--daemon" + +case "$1" in + start) + echo -n "Starting $DESC: " + start-stop-daemon --start -x "$DAEMON" -- $OPTS + echo "$NAME." + ;; + stop) + echo -n "Stopping $DESC: " + start-stop-daemon --stop -x "$DAEMON" + echo "$NAME." + ;; + restart|force-reload) + echo -n "Restarting $DESC: " + start-stop-daemon --stop -x "$DAEMON" + sleep 1 + start-stop-daemon --start -x "$DAEMON" -- $OPTS + echo "$NAME." + ;; + *) + N=/etc/init.d/$NAME + echo "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/meta-webserver/recipes-httpd/monkey/files/monkey.service b/meta-webserver/recipes-httpd/monkey/files/monkey.service new file mode 100644 index 0000000000..f9aa57f91e --- /dev/null +++ b/meta-webserver/recipes-httpd/monkey/files/monkey.service @@ -0,0 +1,12 @@ +[Unit] +Description=Monkey HTTP Server +After=network.target remote-fs.target + +[Service] +Type=forking +ExecStart=/usr/bin/monkey --daemon +PIDFile=/var/run/monkey.pid.2001 +TimeoutSec=10 + +[Install] +WantedBy=multi-user.target diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb deleted file mode 100644 index 6fa1b77e1c..0000000000 --- a/meta-webserver/recipes-httpd/monkey/monkey_1.5.0.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Fast and Lightweight HTTP Server for Linux" -HOMEPAGE = "http://monkey-project.com" -BUGTRACKER = "https://github.com/monkey/monkey/issues" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" - -SECTION = "net" - -SRC_URI = "http://monkey-project.com/releases/1.5/monkey-${PV}.tar.gz" -SRC_URI[md5sum] = "9123fc371334621fde1c060ab17adcd3" -SRC_URI[sha256sum] = "f7a5e4839822750930a723f63a4edbf700e0fb8299a4b3637bd8bab5b1d098a7" - -EXTRA_OECONF = " \ - --plugdir=${libdir}/monkey/ \ - --logdir=${localstatedir}/log/monkey/ \ - --pidfile=${localstatedir}/run/monkey.pid \ - --default-user=www-data \ - --datadir= ${localstatedir}/www/monkey/ \ - --sysconfdir=${sysconfdir}/monkey/ \ - --enable-plugins=* \ - --disable-plugins=polarssl \ - --debug \ - --malloc-libc \ -" - -inherit autotools-brokensep pkgconfig update-rc.d systemd - -INITSCRIPT_NAME = "monkey" -INITSCRIPT_PARAMS = "defaults 70" - -SYSTEMD_SERVICE_${PN} = "monkey.service" - -FILES_${PN} += "${localstatedir}/www/monkey/" - -CONFFILES_${PN} = "${sysconfdir}/monkey/" diff --git a/meta-webserver/recipes-httpd/monkey/monkey_1.5.1.bb b/meta-webserver/recipes-httpd/monkey/monkey_1.5.1.bb new file mode 100644 index 0000000000..2de98f453a --- /dev/null +++ b/meta-webserver/recipes-httpd/monkey/monkey_1.5.1.bb @@ -0,0 +1,50 @@ +SUMMARY = "Fast and Lightweight HTTP Server for Linux" +HOMEPAGE = "http://monkey-project.com" +BUGTRACKER = "https://github.com/monkey/monkey/issues" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2ee41112a44fe7014dce33e26468ba93" + +SECTION = "net" + +SRC_URI = "http://monkey-project.com/releases/1.5/monkey-${PV}.tar.gz \ + file://monkey.service \ + file://monkey.init" + +SRC_URI[md5sum] = "2fe04135728f5c3a86c3a412059e0da3" +SRC_URI[sha256sum] = "28dfc5e57bbcd305727e7af6a1a0587868db1c1286498757bfeb72edddf457e7" + +EXTRA_OECONF = " \ + --plugdir=${libdir}/monkey/ \ + --logdir=${localstatedir}/log/monkey/ \ + --pidfile=${localstatedir}/run/monkey.pid \ + --default-user=www-data \ + --datadir=${localstatedir}/www/monkey/ \ + --sysconfdir=${sysconfdir}/monkey/ \ + --enable-plugins=* \ + --disable-plugins=polarssl \ + --debug \ + --malloc-libc" + +inherit autotools-brokensep pkgconfig update-rc.d systemd + +INITSCRIPT_NAME = "monkey" +INITSCRIPT_PARAMS = "defaults 70" + +SYSTEMD_SERVICE_${PN} = "monkey.service" + +FILES_${PN} += "${localstatedir}/www/monkey/" + +# temporarily remove, because ipk doesn't allow directories in CONFFILES +# CONFFILES_${PN} = "${sysconfdir}/monkey/" + +do_install_append() { + + mkdir -p ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/monkey.init ${D}${sysconfdir}/init.d/monkey + + if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 644 ${WORKDIR}/monkey.service ${D}/${systemd_unitdir}/system + fi +} -- cgit 1.2.3-korg