From 6c8d163eabc9fa5f5152115d8520853de599ea03 Mon Sep 17 00:00:00 2001
From: Wynn Wolf Arbor
Date: Wed, 27 May 2020 13:03:44 +0200
Subject: www-misc/slowcgi: Simplify init script and configuration

Use a single variable indicating the chroot(2) directory instead of
relying on the user to provide the full set of command arguments.

Additionally, use /run/${RC_SVCNAME}.sock for the socket path, enabling
multiple slowcgi instances to run in parallel.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
---
 www-misc/slowcgi/files/slowcgi.confd | 3 ++-
 www-misc/slowcgi/files/slowcgi.initd | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'www-misc/slowcgi/files')

diff --git a/www-misc/slowcgi/files/slowcgi.confd b/www-misc/slowcgi/files/slowcgi.confd
index 8cef8a4..861fff1 100644
--- a/www-misc/slowcgi/files/slowcgi.confd
+++ b/www-misc/slowcgi/files/slowcgi.confd
@@ -1 +1,2 @@
-SLOWCGI_OPTS="-d -p / -s /run/slowcgi.sock -U slowcgi -u slowcgi"
+# To change the directory slowcgi will chroot(2) into, set SLOWCGI_CHROOT.
+# If unset, slowcgi will use /, effectively disabling the chroot.
diff --git a/www-misc/slowcgi/files/slowcgi.initd b/www-misc/slowcgi/files/slowcgi.initd
index 8c983f9..1aff8fb 100644
--- a/www-misc/slowcgi/files/slowcgi.initd
+++ b/www-misc/slowcgi/files/slowcgi.initd
@@ -2,8 +2,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-name="${RC_SVCNAME}"
 command="slowcgi"
-command_args="${SLOWCGI_OPTS}"
+command_args="-d -p \"${SLOWCGI_CHROOT:-/}\" -s \"/run/${RC_SVCNAME}.sock\" -U slowcgi -u slowcgi"
 command_background=yes
 pidfile="/run/${RC_SVCNAME}.pid"
-- 
cgit v1.2.3-2-gb3c3