From owner-svn-ports-head@freebsd.org Mon Mar 15 22:21:55 2021 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 50EAC56A048; Mon, 15 Mar 2021 22:21:55 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DzrW71t8Cz4XZC; Mon, 15 Mar 2021 22:21:55 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 29FD1186A0; Mon, 15 Mar 2021 22:21:55 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 12FMLtOJ017576; Mon, 15 Mar 2021 22:21:55 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 12FMLsQt017575; Mon, 15 Mar 2021 22:21:54 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <202103152221.12FMLsQt017575@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 15 Mar 2021 22:21:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r568513 - in head/net/asterisk13: . files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: in head/net/asterisk13: . files X-SVN-Commit-Revision: 568513 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Mar 2021 22:21:55 -0000 Author: madpilot Date: Mon Mar 15 22:21:54 2021 New Revision: 568513 URL: https://svnweb.freebsd.org/changeset/ports/568513 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 Modified: head/net/asterisk13/Makefile head/net/asterisk13/files/asterisk.in Modified: head/net/asterisk13/Makefile ============================================================================== --- head/net/asterisk13/Makefile Mon Mar 15 22:11:37 2021 (r568512) +++ head/net/asterisk13/Makefile Mon Mar 15 22:21:54 2021 (r568513) @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 13.38.2 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ Modified: head/net/asterisk13/files/asterisk.in ============================================================================== --- head/net/asterisk13/files/asterisk.in Mon Mar 15 22:11:37 2021 (r568512) +++ head/net/asterisk13/files/asterisk.in Mon Mar 15 22:21:54 2021 (r568513) @@ -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"