Date: Mon, 14 Sep 2020 16:28:42 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548625 - in head/net/asterisk13: . files Message-ID: <202009141628.08EGSgKA055229@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Mon Sep 14 16:28:42 2020 New Revision: 548625 URL: https://svnweb.freebsd.org/changeset/ports/548625 Log: Add to support for configurable umask to asterisk startup script. PR: 249177 Submitted by: mickey242@gmx.net Modified: head/net/asterisk13/Makefile head/net/asterisk13/files/asterisk.in Modified: head/net/asterisk13/Makefile ============================================================================== --- head/net/asterisk13/Makefile Mon Sep 14 16:15:44 2020 (r548624) +++ head/net/asterisk13/Makefile Mon Sep 14 16:28:42 2020 (r548625) @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 13.36.0 +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 Sep 14 16:15:44 2020 (r548624) +++ head/net/asterisk13/files/asterisk.in Mon Sep 14 16:28:42 2020 (r548625) @@ -19,6 +19,7 @@ # Default is /var/run/asterisk/asterisk.pid # asterisk_stopsleep (int): Number of seconds to sleep before sending stop command # Default is 0, which disables it +# asterisk_umask (string): File creation mode mask to run asterisk with # . /etc/rc.subr @@ -27,14 +28,6 @@ name=asterisk rcvar=asterisk_enable desc="Asterisk PBX server" -load_rc_config $name - -: ${asterisk_enable:=NO} -: ${asterisk_user:=%%ASTERISK_USER%%} -: ${asterisk_args=-n} -: ${asterisk_pidfile:=/var/run/asterisk/asterisk.pid} -: ${asterisk_stopsleep:=0} - extra_commands=reload start_precmd=asterisk_precmd @@ -42,8 +35,6 @@ stop_cmd=asterisk_stop reload_cmd=asterisk_reload command="%%PREFIX%%/sbin/asterisk" -command_args="${asterisk_args} -F -U ${asterisk_user}" -pidfile=${asterisk_pidfile} asterisk_precmd() { @@ -51,6 +42,9 @@ asterisk_precmd() if [ ! -d $rundir ] ; then install -d -m 0755 -o asterisk -g asterisk $rundir fi + if [ -n "${asterisk_umask}" ]; then + umask ${asterisk_umask} + fi } asterisk_stop() @@ -77,5 +71,16 @@ 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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009141628.08EGSgKA055229>