diff -ruN /home/timp/vault.orig/Makefile vault/Makefile --- /home/timp/vault.orig/Makefile 2017-01-07 11:05:03.172952000 +0300 +++ vault/Makefile 2017-01-09 08:42:29.284520000 +0300 @@ -3,7 +3,7 @@ PORTNAME= vault PORTVERSION= 0.6.4 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security MAINTAINER= swills@FreeBSD.org diff -ruN /home/timp/vault.orig/files/vault.in vault/files/vault.in --- /home/timp/vault.orig/files/vault.in 2017-01-07 11:05:03.173877000 +0300 +++ vault/files/vault.in 2017-01-09 08:50:11.217726000 +0300 @@ -9,37 +9,71 @@ # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # -# vault_enable (bool): Set to NO by default. -# Set it to YES to enable vault. -# vault_user (user): Set user to run vault. -# Default is "vault". -# vault_group (group): Set group to run vault. -# Default is "vault". -# vault_config (dir): Set vault config file. -# Default is "%%PREFIX%%/etc/vault.hcl". -# vault_env (dir): Set environment variables used with vault -# Default is "". +# vault_enable (bool): Set it to YES to enable vault. +# Default is "NO". +# vault_user (user): Set user to run vault. +# Default is "vault". +# vault_group (group): Set group to run vault. +# Default is "vault". +# vault_config (dir): Set vault config file. +# Default is "%%PREFIX%%/etc/vault.hcl". +# vault_env (dir): Set environment variables used with vault +# Default is "". +# vault_syslog_output_enable (bool): Set to enable syslog output. +# Default is "NO". See daemon(8). +# vault_syslog_output_priority (str): Set syslog priority if syslog enabled. +# Default is "info". See daemon(8). +# vault_syslog_output_facility (str): Set syslog facility if syslog enabled. +# Default is "daemon". See daemon(8). . /etc/rc.subr name=vault rcvar=vault_enable -load_rc_config $name - -: ${vault_enable:="NO"} -: ${vault_user:="vault"} -: ${vault_group:="vault"} -: ${vault_config:="%%PREFIX%%/etc/vault.hcl"} -: ${vault_env:=""} - -pidfile=/var/run/vault.pid -procname="%%PREFIX%%/bin/vault" command="/usr/sbin/daemon" -command_args="-f -t ${name} -p ${pidfile} /usr/bin/env ${vault_env} ${procname} server -config=${vault_config}" +extra_commands="reload monitor" +monitor_cmd=vault_monitor start_precmd=vault_startprecmd +vault_load_rc_config() { + : ${vault_enable:="NO"} + : ${vault_user:="vault"} + : ${vault_group:="vault"} + : ${vault_config:="%%PREFIX%%/etc/vault.hcl"} + : ${vault_env:=""} + : ${vault_syslog_output_enable:="NO"} + + vault_get_syslog_flags + + required_files="$vault_config" + pidfile="/var/run/vault.pid" + procname="%%PREFIX%%/bin/vault" + command_args="-f ${vault_syslog_output_flags} -t ${name} -p ${pidfile} /usr/bin/env ${vault_env} ${procname} server -config=${vault_config}" +} + +vault_get_syslog_flags() +{ + if checkyesno vault_syslog_output_enable; then + vault_syslog_output_flags="-T ${name}" + + if [ -n "${vault_syslog_output_priority}" ]; then + vault_syslog_output_flags="${vault_syslog_output_flags} -s ${vault_syslog_output_priority}" + fi + + if [ -n "${vault_syslog_output_facility}" ]; then + vault_syslog_output_flags="${vault_syslog_output_flags} -l ${vault_syslog_output_facility}" + fi + fi +} + +vault_monitor() +{ + sig_reload=USR1 + run_rc_command "reload" +} + vault_startprecmd() { if [ ! -e ${pidfile} ]; then @@ -49,7 +83,8 @@ if [ ! -d ${vault_dir} ]; then install -d -o ${vault_user} -g ${vault_group} ${vault_dir} fi - } +load_rc_config $name +vault_load_rc_config run_rc_command "$1"