From 5fd553eceec8325f829089d13e5828e002393438 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 30 Apr 2015 06:09:23 +0000
Subject: main/darkhttpd: allow multiple instances

---
 main/darkhttpd/APKBUILD        | 8 ++++----
 main/darkhttpd/darkhttpd.initd | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'main/darkhttpd')

diff --git a/main/darkhttpd/APKBUILD b/main/darkhttpd/APKBUILD
index 642c5a34f..b0a5e498a 100644
--- a/main/darkhttpd/APKBUILD
+++ b/main/darkhttpd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Alan Messias Cordeiro <alancordeiro@gmail.com>
 pkgname=darkhttpd
 pkgver=1.11
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple, single-threaded, static content webserver"
 url="http://unix4lyfe.org/darkhttpd/"
 arch="all"
@@ -45,10 +45,10 @@ package() {
 
 md5sums="050e5a821b1fa71a82c6efba7fda1323  darkhttpd-1.11.tar.bz2
 63aa435ce78851d57c39426e34ec728b  darkhttpd.logrotate
-43240f57da51481554ccb7e1710baf45  darkhttpd.initd"
+c415ef1da584842708746d80da548570  darkhttpd.initd"
 sha256sums="afad244add43c53010b36ada6ccdf1a854885cb37d6aeff103ad0aa4aed96c51  darkhttpd-1.11.tar.bz2
 b4441bef90ca7fce5861edab165a3a7ea21b2e63faf27ec85aa85702fc8ac96b  darkhttpd.logrotate
-395e5b063f0f7ded6b21228fc7300737bc70b6697230669dd8233cfbf748ed97  darkhttpd.initd"
+13d64145ac6dc48fecbfa8a734b2253bbfb4d6c68f2261c49c79643d2de61840  darkhttpd.initd"
 sha512sums="91ce6b2acd963b1ea593b4e48601c08d66afac44c2cbd34f087ee0b536e68876b8e8f572588bc1beefb899d08f7625d2c8fffdf1ba3b7389185b4f8e0750e1d9  darkhttpd-1.11.tar.bz2
 bb95277a9f8f227aeec8bfe6ef54f52a2f034ed0dd25258b996c17f9ce9dd4ad220366b10490246b25bb6b18ccde7bda0d52eeb88667941cf2fdab15c940dbbc  darkhttpd.logrotate
-75d4f319d4aee5ae5c30962c0487e1dc4923d0277a842ead583bb9b0a6d0313bd87cb9b55130faaeabc3ae5a848c29a9081f1af33ddbb4e85b5cd11083968383  darkhttpd.initd"
+4a2562c265b6e4473ac22960a9188c598b60e6d53ec8c92a09478bc4c9b18a5adc2cbb451b38b6e3fafc1bb373ad2970c421742be87d8f979a51ec19d95a4468  darkhttpd.initd"
diff --git a/main/darkhttpd/darkhttpd.initd b/main/darkhttpd/darkhttpd.initd
index 42514fa65..1ba6e0ad8 100644
--- a/main/darkhttpd/darkhttpd.initd
+++ b/main/darkhttpd/darkhttpd.initd
@@ -2,7 +2,7 @@
 
 description="darkhttpd web server"
 command="/usr/bin/darkhttpd"
-command_args="${document_root:-/var/www/localhost/htdocs} --chroot --daemon --uid darkhttpd --gid www-data --log /var/log/darkhttpd/access.log $darkhttpd_args"
+command_args="${document_root:-/var/www/localhost/htdocs} --chroot --daemon --uid darkhttpd --gid www-data $darkhttpd_args"
 procname="darkhttpd"
 pidfile=""
 stopsig="SIGTERM"
@@ -14,7 +14,10 @@ optional_arg() {
 }
 
 start_pre() {
+	checkpath --directory --owner darkhttpd "${logdir:-/var/log/$SVCNAME}"
+	optional_arg --log "${logdir:-/var/log/$SVCNAME}"/access.log
 	optional_arg --addr "$addr"
 	optional_arg --port "$port"
 	optional_arg --mimetypes "$mimetypes"
 }
+
-- 
cgit v1.2.3