summaryrefslogtreecommitdiffstats
path: root/network/opendkim/rc.opendkim
diff options
context:
space:
mode:
Diffstat (limited to 'network/opendkim/rc.opendkim')
-rw-r--r--network/opendkim/rc.opendkim9
1 files changed, 6 insertions, 3 deletions
diff --git a/network/opendkim/rc.opendkim b/network/opendkim/rc.opendkim
index 23170a16e6..ef6e1a6ff5 100644
--- a/network/opendkim/rc.opendkim
+++ b/network/opendkim/rc.opendkim
@@ -6,7 +6,8 @@
# Modified from the script by Steve Jenkins (SteveJenkins.com) - 10-29-2012
# Based on a script by Andrew Colin Kissa (TopDog) for dkim-milter - 05-28-2009
-USER="opendkim"
+DKUSER="@DKUSER@"
+DKGROUP="@DKGROUP@"
PROGRAM=/usr/sbin/opendkim
CONF_FILE=/etc/opendkim.conf
PID_FILE=/var/run/opendkim/opendkim.pid
@@ -23,8 +24,8 @@ do_dkim_keygen() {
else
mkdir -p $DKIM_KEYDIR
$KEYGEN -b 2048 -D $DKIM_KEYDIR -s $DKIM_SELECTOR -d "$(hostname -d)"
- chown root:$USER $DKIM_KEYDIR
- chown $USER:$USER $DKIM_KEYDIR/$DKIM_SELECTOR.{private,txt}
+ chown root:$DK_USER $DKIM_KEYDIR
+ chown $DKUSER:$DKGROUP $DKIM_KEYDIR/$DKIM_SELECTOR.{private,txt}
chmod 600 $DKIM_KEYDIR/$DKIM_SELECTOR.private
chmod 644 $DKIM_KEYDIR/$DKIM_SELECTOR.txt
echo
@@ -47,6 +48,8 @@ case "$1" in
echo OpenDKIM already running as pid "$PID"
exit 2;
else
+ mkdir -p $(dirname $PID_FILE)
+ chown $DKUSER:$DKGROUP $(dirname $PID_FILE)
$PROGRAM -l -x $CONF_FILE -P $PID_FILE
fi
;;