Date: Sat, 20 Dec 2014 13:25:58 +0000 (UTC) From: Rong-En Fan <rafan@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375003 - head/mail/mailgraph/files Message-ID: <201412201325.sBKDPwrD017966@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rafan Date: Sat Dec 20 13:25:57 2014 New Revision: 375003 URL: https://svnweb.freebsd.org/changeset/ports/375003 QAT: https://qat.redports.org/buildarchive/r375003/ Log: - rc script enhancements - pass maintainership - bump PORTREVISION PR: 196090 Submitted by: geoffroy desvernay <dgeo at centrale-marseille.fr> Modified: head/mail/mailgraph/files/mailgraph.in Modified: head/mail/mailgraph/files/mailgraph.in ============================================================================== --- head/mail/mailgraph/files/mailgraph.in Sat Dec 20 13:17:13 2014 (r375002) +++ head/mail/mailgraph/files/mailgraph.in Sat Dec 20 13:25:57 2014 (r375003) @@ -17,14 +17,18 @@ rcvar=mailgraph_enable command=%%PREFIX%%/sbin/${name}.pl command_args='> /dev/null 2>&1' -command_interpreter=/usr/bin/perl +command_interpreter=%%PERL%% start_precmd=start_precmd stop_postcmd=stop_postcmd start_precmd() { - mkdir -p "%%DATADIR%%" - chown "%%MAILGRAPH_USER%%" "%%DATADIR%%" + mkdir -p "$mailgraph_chdir" + chown "$mailgraph_user" "$mailgraph_chdir" + if ! su -m '$mailgraph_user' -c 'sh -c "[ -r '$mailgraph_maillog' ]"'; then + echo "MAILGRAPH CANNOT RUN: $mailgraph_maillog not readable by $mailgraph_user" + return 1 + fi } stop_postcmd() @@ -35,10 +39,11 @@ stop_postcmd() load_rc_config $name : ${mailgraph_enable="NO"} -: ${mailgraph_pidfile="%%DATADIR%%/mailgraph.pid"} -: ${mailgraph_flags="--logfile /var/log/maillog --daemon-rrd=%%DATADIR%% --ignore-localhost --daemon --daemon-pid=${mailgraph_pidfile}"} -: ${mailgraph_user="%%MAILGRAPH_USER%%"} : ${mailgraph_chdir="%%DATADIR%%"} +: ${mailgraph_pidfile="$mailgraph_chdir/mailgraph.pid"} +: ${mailgraph_maillog="/var/log/maillog"} +: ${mailgraph_flags="--logfile $mailgraph_maillog --daemon-rrd=$mailgraph_chdir --ignore-localhost --daemon --daemon-pid=$mailgraph_pidfile"} +: ${mailgraph_user="%%MAILGRAPH_USER%%"} pidfile=${mailgraph_pidfile}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412201325.sBKDPwrD017966>