diff options
-rw-r--r-- | net/asterisk16/Makefile | 1 | ||||
-rw-r--r-- | net/asterisk16/files/asterisk.in | 25 |
2 files changed, 16 insertions, 10 deletions
diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index 5fdcb23d9ede..b00b68918f3f 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 16.13.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ diff --git a/net/asterisk16/files/asterisk.in b/net/asterisk16/files/asterisk.in index 87127d3e9b32..80cfdb093737 100644 --- a/net/asterisk16/files/asterisk.in +++ b/net/asterisk16/files/asterisk.in @@ -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() @@ -78,4 +72,15 @@ asterisk_reload() $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" |