From 78548dba2a5a4c74d5940107a6b2c9a0aa8e1c9f Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sun, 1 May 2016 10:41:52 +0200
Subject: [PATCH] monkey: switch webroot to /srv/www/monkey; user to _monkey;
 create dirs in service.

---
 srcpkgs/monkey/files/monkey/run | 15 ++++++++++++++-
 srcpkgs/monkey/template         | 19 +++++++------------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/monkey/files/monkey/run b/srcpkgs/monkey/files/monkey/run
index 71ffa9e4787..f1690cd5452 100755
--- a/srcpkgs/monkey/files/monkey/run
+++ b/srcpkgs/monkey/files/monkey/run
@@ -1,3 +1,16 @@
 #!/bin/sh
+[ -s conf ] && . ./conf
 
-exec chpst -uhttpd monkey
+: ${ROOTDIR:=/srv/www/monkey}
+: ${LOGDIR:=/var/log/monkey}
+
+if [ ! -d $ROOTDIR ]; then
+	mkdir -p $ROOTDIR
+	chown _monkey:_monkey $ROOTDIR
+fi
+if [ ! -d $LOGDIR ]; then
+	mkdir -p $LOGDIR/htdocs
+	chown _monkey:_monkey -R $LOGDIR
+fi
+
+exec chpst -u monkey:monkey monkey
diff --git a/srcpkgs/monkey/template b/srcpkgs/monkey/template
index 8de08ca3b10..d880599ee63 100644
--- a/srcpkgs/monkey/template
+++ b/srcpkgs/monkey/template
@@ -1,15 +1,15 @@
 # Template file for 'monkey'
 pkgname=monkey
 version=1.6.8
-revision=1
+revision=2
 build_style=configure
 hostmakedepends="cmake"
 makedepends="mbedtls-devel"
 configure_args+="--prefix=/usr --sbindir=/usr/bin --libdir=/usr/lib "
 configure_args+="--sysconfdir=/etc/monkey/ --enable-plugins=mbedtls "
-configure_args+="--webroot=/srv/httpd --mandir=/usr/share/man "
+configure_args+="--webroot=/srv/www/$pkgname --mandir=/usr/share/man "
 configure_args+="--pidfile=/var/run/monkey.pid --logdir=/var/log/monkey "
-configure_args+="--malloc-libc --default-user=httpd "
+configure_args+="--malloc-libc --default-user=_$pkgname "
 short_desc="Cross-arch embeddable lightweight HTTP server"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="Apache-2.0"
@@ -17,10 +17,6 @@ homepage="http://monkey-project.com"
 distfiles="${homepage}/releases/${version%.*}/${pkgname}-${version}.tar.gz"
 checksum=936aa276d11dea77cda2703eb5d1b89ede1cf8d44440e1ec029cafb10effb3cf
 
-make_dirs="
- /var/log/monkey 0755 root httpd
- /srv/httpd/htdocs 0755 root httpd"
-
 conf_files="
  /etc/monkey/plugins/*/*.conf
  /etc/monkey/plugins/dirlisting/themes/*/*.theme
@@ -29,17 +25,16 @@ conf_files="
  /etc/monkey/plugins.load
  /etc/monkey/monkey.mime"
 
-system_accounts="httpd"
-httpd_descr="Monkey HTTP server"
-httpd_homedir="/srv/httpd"
+system_accounts="_$pkgname"
+_monkey_homedir="/srv/www/$pkgname"
 
 case $XBPS_TARGET_MACHINE in
 	*-musl) configure_args+="--musl-mode --no-backtrace ";;
 esac
 
 post_install() {
-	vmkdir usr/share/monkey/htdocs
-	mv ${DESTDIR}/srv/httpd/* ${DESTDIR}/usr/share/monkey/htdocs
+	vmkdir usr/share/monkey/webroot
+	mv ${DESTDIR}/srv/www/$pkgname/* ${DESTDIR}/usr/share/monkey/webroot
 	vsv monkey
 }