Received: from savage.far.fi (savage.far.fi [193.28.89.12]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTP id 975C178198D for ; Wed, 19 Feb 2020 20:29:50 +0000 (UTC) Received: from klein.local (unknown [91.145.108.22]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by savage.far.fi (Postfix) with ESMTPSA id 3104EC2003; Wed, 19 Feb 2020 20:26:57 +0000 (UTC) Received: from localhost (klein.local [local]) by klein.local (OpenSMTPD) with ESMTPA id c684966c; Wed, 19 Feb 2020 22:29:49 +0200 (EET) From: Wictor Lund To: alpine-aports@lists.alpinelinux.org Cc: Wictor Lund Subject: [PATCH v2] main/darkhttpd: --daemon should not be used with supervise-daemon Date: Wed, 19 Feb 2020 22:29:30 +0200 Message-Id: <20200219202930.1503-1-wictory@iki.fi> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200219194526.14795-1-wictory@iki.fi> References: <20200219194526.14795-1-wictory@iki.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When --daemon is present when darkhttpd is supervised, openrc can't kill darkhttpd. --- main/darkhttpd/APKBUILD | 2 +- main/darkhttpd/darkhttpd.initd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main/darkhttpd/APKBUILD b/main/darkhttpd/APKBUILD index aa7c9bb583..68e95611d8 100644 --- a/main/darkhttpd/APKBUILD +++ b/main/darkhttpd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Alan Lacerda pkgname=darkhttpd pkgver=1.12 -pkgrel=3 +pkgrel=4 pkgdesc="A simple, single-threaded, static content webserver" url="https://unix4lyfe.org/darkhttpd/" arch="all" diff --git a/main/darkhttpd/darkhttpd.initd b/main/darkhttpd/darkhttpd.initd index dc23c6e621..93154234d8 100644 --- a/main/darkhttpd/darkhttpd.initd +++ b/main/darkhttpd/darkhttpd.initd @@ -6,7 +6,7 @@ name="darkhttpd web server" description="Simple, single-threaded, static content webserver" command="/usr/bin/darkhttpd" -command_args="${document_root:-/var/www/localhost/htdocs} --chroot --daemon --uid darkhttpd --gid www-data $darkhttpd_args" +command_args="${document_root:-/var/www/localhost/htdocs} --chroot --uid darkhttpd --gid www-data $darkhttpd_args" optional_arg() { if [ -n "$2" ]; then -- 2.24.1