diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2022-01-03 07:05:56 +0000 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2022-01-03 07:23:10 +0000 |
| commit | b3d1562709b1135f1792dc40b47af195622325bc (patch) | |
| tree | db73de34f1fc2a93ba4dfb6a5e1c3f4540dbd095 /audio | |
| parent | 2f7218b2eafff0968d2a76d12f85a53d9038851c (diff) | |
| download | ports-b3d1562709b1135f1792dc40b47af195622325bc.tar.gz ports-b3d1562709b1135f1792dc40b47af195622325bc.zip | |
audio/jamulus: Fix jamulus-server arguments
* allow to override user name for the daemon with jamulus_server_uname
* allow to set server arguments with jamulus_server_args
PR: 260860
Reported by: Stefan Bethke <stb@lassitu.de>
(cherry picked from commit 5e56a22d7125752516dcbf1b89534d38de0bbb9a)
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/jamulus/Makefile | 1 | ||||
| -rw-r--r-- | audio/jamulus/files/jamulus-server.in | 12 |
2 files changed, 9 insertions, 4 deletions
diff --git a/audio/jamulus/Makefile b/audio/jamulus/Makefile index 750323eec68d..75e98cd1293e 100644 --- a/audio/jamulus/Makefile +++ b/audio/jamulus/Makefile @@ -1,6 +1,7 @@ PORTNAME= jamulus DISTVERSIONPREFIX= r DISTVERSION= 3_8_1 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= yuri@FreeBSD.org diff --git a/audio/jamulus/files/jamulus-server.in b/audio/jamulus/files/jamulus-server.in index 9ff0da5f678d..d1d135048e2c 100644 --- a/audio/jamulus/files/jamulus-server.in +++ b/audio/jamulus/files/jamulus-server.in @@ -5,9 +5,11 @@ # KEYWORD: shutdown # Add the following lines to /etc/rc.conf to enable jamulus_server: -# jamulus_server_enable : set to "YES" to enable the daemon, default is "NO" -# jamulus_server_flags : any extra flags, default is "" -# - list of all possible flags: https://jamulus.io/wiki/Command-Line-Options +# jamulus_server_enable : set to "YES" to enable the daemon, default is "NO" +# jamulus_server_uname : user to run jamulus-server as, default is "%%USER%%" +# jamulus_server_flags : extra flags to pass to daemon(8), default is "" +# jamulus_server_args : any arguments to pass to jamulus-server, default is "" +# - list of all possible arguments: https://jamulus.io/wiki/Command-Line-Options . /etc/rc.subr @@ -17,12 +19,14 @@ rcvar=jamulus_server_enable load_rc_config $name jamulus_server_enable=${jamulus_server_enable:-"NO"} +jamulus_server_uname=${jamulus_server_uname:-"%%USER%%"} jamulus_server_flags=${jamulus_server_flags:-""} +jamulus_server_args=${jamulus_server_args:-""} logfile="/var/log/${name}.log" procname=%%PREFIX%%/bin/jamulus-server command="/usr/sbin/daemon" -command_args="-u %%USER%% -o ${logfile} -t ${name} %%PREFIX%%/bin/jamulus-server -s ${jamulus_server_flags}" +command_args="-u ${jamulus_server_uname} -o ${logfile} -t ${name} %%PREFIX%%/bin/jamulus-server -s ${jamulus_server_args}" run_rc_command "$1" |