|
|
@@ -33,6 +33,8 @@ SIGNTABLE="${DKIMCONF}/signing.table"
|
|
|
KEYDIR="${DKIMCONF}/keys"
|
|
|
ZONESDIR="/etc/bind/zones"
|
|
|
KEYGEN=/usr/bin/opendkim-genkey
|
|
|
+SYSCTL=/bin/systemctl
|
|
|
+JOURCTL=/bin/journalctl
|
|
|
LOGGER=/usr/bin/logger
|
|
|
LOGGERFLAGN="-t $(whoami) -p daemon.info"
|
|
|
LOGGERFLAGE="-t $(whoami) -p daemon.err"
|
|
|
@@ -136,6 +138,7 @@ ENTRIES="${*}"
|
|
|
IFS=' ', read -r -a ENTRIES <<< "${ENTRIES}"
|
|
|
|
|
|
if [ ${#ENTRIES[@]} -ne 0 ]; then
|
|
|
+ note_msg "date" "$(date)"
|
|
|
note_msg "${#ENTRIES[@]}" "Start signing"
|
|
|
CWDIR=$(pwd)
|
|
|
for ENTRY in "${ENTRIES[@]}"; do
|
|
|
@@ -145,6 +148,11 @@ if [ ${#ENTRIES[@]} -ne 0 ]; then
|
|
|
chown -R "${DKIMUSER}:${DKIMGROUP}" "${DKIMCONF}"
|
|
|
chmod -R go-rw "${DKIMCONF}"
|
|
|
if [ "${RESIGNDNS}" -eq 1 ]; then
|
|
|
+ note_msg "$(basename ${SYSCTL})" "Restarting opendkim.service"
|
|
|
+ ${SYSCTL} restart "opendkim.service"
|
|
|
+ if [ $? -ne 0 ]; then
|
|
|
+ ${JOURCTL} -l 10 --unit "opendkim.service" | xargs -0
|
|
|
+ fi
|
|
|
${DNSTOOL} "${ENTRIES[@]}"
|
|
|
fi
|
|
|
else
|
root