cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mail/opendkim: Add GID support to the rc script

Browse Source 
PR:		208056
Submitted by:	Krzysztof <ports@bsdserwis.com>
Approved by:	Daniel Austin <freebsd-ports@dan.me.uk> (maintainer)
This commit is contained in:
Steve Wills 2017-08-18 20:49:16 +00:00
parent 0199b71ed4
commit e98e7fb78f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=448274
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/opendkim/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= opendkim
PORTVERSION= 2.10.3
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= mail security
MASTER_SITES= SF/${PORTNAME} \
SF/${PORTNAME}/Previous%20Releases \

26
mail/opendkim/files/milter-opendkim.in
View File

@ -16,6 +16,7 @@
# milteropendkim_enable (bool): Set to "NO" by default.
# Set it to "YES" to enable dkim-milter
# milteropendkim_uid (str): Set username to run milter.
# milteropendkim_gid (str): Set group to run milter.
# milteropendkim_profiles (list): Set to "" by default.
# Define your profiles here.
# milteropendkim_cfgfile (str): Configuration file. See opendkim.conf(5)
@ -38,9 +39,11 @@ rcvar=milteropendkim_enable
extra_commands="reload"
start_precmd="dkim_prepcmd"
start_postcmd="dkim_start_postcmd"
stop_postcmd="dkim_postcmd"
command="%%PREFIX%%/sbin/opendkim"
_piddir="/var/run/milteropendkim"
_piddir_perms="0755"
pidfile="${_piddir}/pid"
sig_reload="USR1"
@ -51,6 +54,7 @@ load_rc_config $name
#
: ${milteropendkim_enable="NO"}
: ${milteropendkim_uid="mailnull"}
: ${milteropendkim_gid="mailnull"}
: ${milteropendkim_cfgfile="%%PREFIX%%/etc/mail/opendkim.conf"}
# Options other than above can be set with $milteropendkim_flags.
@ -82,6 +86,9 @@ if [ -n "$2" ]; then
fi
if [ "x${milteropendkim_uid}" != "x" ];then
_uid_prefix="-u"
if [ "x${milteropendkim_gid}" != "x" ];then
milteropendkim_uid=${milteropendkim_uid}:${milteropendkim_gid}
fi
fi
if [ "x${milteropendkim_domain}" != "x" ];then
milteropendkim_domain="-d ${milteropendkim_domain}"
@ -127,6 +134,9 @@ else
fi
if [ "x${milteropendkim_uid}" != "x" ];then
_uid_prefix="-u"
if [ "x${milteropendkim_gid}" != "x" ];then
milteropendkim_uid=${milteropendkim_uid}:${milteropendkim_gid}
fi
fi
if [ "x${milteropendkim_domain}" != "x" ];then
milteropendkim_domain="-d ${milteropendkim_domain}"
@ -157,6 +167,22 @@ dkim_prepcmd ()
if [ -n "${milteropendkim_uid}" ] ; then
chown ${milteropendkim_uid} ${_piddir}
fi
if [ -n "${milteropendkim_gid}" ] ; then
chgrp ${milteropendkim_gid} ${_piddir}
_piddir_perms="0775"
fi
chmod ${_piddir_perms} ${_piddir}
}
dkim_start_postcmd ()
{
# postcmd is executed too fast and socket is not created before checking...
sleep 1
if [ -S ${milteropendkim_socket##local:} ] ; then
chmod ${_piddir_perms} ${milteropendkim_socket##local:}
elif [ -S ${milteropendkim_socket##unix:} ] ; then
chmod ${_piddir_perms} ${milteropendkim_socket##unix:}
fi
}
dkim_postcmd()