svn commit: r568514 - in head/net/asterisk16: . files

[Guido Falsi]

Author: madpilot
Date: Mon Mar 15 22:22:11 2021
New Revision: 568514
URL: https://svnweb.freebsd.org/changeset/ports/568514

Log:
  - Add variable to configure group owner for asterisk runtime directory
    creation in startup script
  - Correct order of variables
  
  PR:		254232
  SUbmitted by:	Boris Korzun <drtr0jan at yandex.ru>

Modified:
  head/net/asterisk16/Makefile
  head/net/asterisk16/files/asterisk.in

Modified: head/net/asterisk16/Makefile
==============================================================================
--- head/net/asterisk16/Makefile	Mon Mar 15 22:21:54 2021	(r568513)
+++ head/net/asterisk16/Makefile	Mon Mar 15 22:22:11 2021	(r568514)
@@ -2,6 +2,7 @@
 
 PORTNAME=	asterisk
 PORTVERSION=	16.16.2
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \

Modified: head/net/asterisk16/files/asterisk.in
==============================================================================
--- head/net/asterisk16/files/asterisk.in	Mon Mar 15 22:21:54 2021	(r568513)
+++ head/net/asterisk16/files/asterisk.in	Mon Mar 15 22:22:11 2021	(r568514)
@@ -13,6 +13,8 @@
 #				Default is "NO"
 # asterisk_user (string):	User asterisk runs as
 #				Default is %%ASTERISK_USER%%
+# asterisk_group (string):	Group asterisk runs as
+#				Default is %%ASTERISK_GROUP%%
 # asterisk_args (string):	Extra argumeents to pass to asterisk at startup
 # 				Default is "-n"
 # asterisk_pidfile (string):	Location of the asterisk pid file
@@ -28,19 +30,31 @@ name=asterisk
 rcvar=asterisk_enable
 desc="Asterisk PBX server"
 
+load_rc_config $name
+
+: ${asterisk_enable:=NO}
+: ${asterisk_user:=%%ASTERISK_USER%%}
+: ${asterisk_group:=%%ASTERISK_GROUP%%}
+: ${asterisk_args=-n}
+: ${asterisk_pidfile:=/var/run/asterisk/asterisk.pid}
+: ${asterisk_stopsleep:=0}
+
 extra_commands=reload
 
 start_precmd=asterisk_precmd
 stop_cmd=asterisk_stop
 reload_cmd=asterisk_reload
 
+pidfile="${asterisk_pidfile}"
+
 command="%%PREFIX%%/sbin/asterisk"
+command_args="${asterisk_args} -F -U ${asterisk_user}"
 
 asterisk_precmd()
 {
 	local rundir=${asterisk_pidfile%/*}
 	if [ ! -d $rundir ] ; then
-		install -d -m 0755 -o asterisk -g asterisk $rundir
+		install -d -m 0750 -o "${asterisk_user}" -g "${asterisk_group}" "$rundir"
 	fi
 	if [ -n "${asterisk_umask}" ]; then
 		umask ${asterisk_umask}
@@ -71,16 +85,5 @@ asterisk_reload()
 	echo 'Reloading asterisk.'
 	$command -nqrx 'reload'
 }
-
-load_rc_config $name
-
-: ${asterisk_enable:=NO}
-: ${asterisk_user:=%%ASTERISK_USER%%}
-: ${asterisk_args=-n}
-: ${asterisk_pidfile:=/var/run/asterisk/asterisk.pid}
-: ${asterisk_stopsleep:=0}
-
-command_args="${asterisk_args} -F -U ${asterisk_user}"
-pidfile=${asterisk_pidfile}
 
 run_rc_command "$1"