Add 'socket' option to opendkim.conf - debian stretch seems to ignore file '/etc/default/opendkim'.
This commit is contained in:
parent
19f87a3d1a
commit
37b16e39d8
@ -105,6 +105,18 @@ fi
|
||||
|
||||
echo ""
|
||||
|
||||
# - Synchronise package index files with the repository
|
||||
# -
|
||||
echononl " Synchronise package index files with the repository.."
|
||||
apt-get update > "$log_file" 2>&1
|
||||
if [[ $? -eq 0 ]] ; then
|
||||
echo_ok
|
||||
else
|
||||
echo_failed
|
||||
error "$(cat $log_file)"
|
||||
fi
|
||||
|
||||
|
||||
# - Install OpenDKIM
|
||||
# -
|
||||
echononl " Install needed debian packages.."
|
||||
@ -138,7 +150,7 @@ echononl " Add user 'postfix' to group 'opendkim'.."
|
||||
if grep opendkim /etc/group | grep -q postfix 2> /dev/null ; then
|
||||
echo_skipped
|
||||
else
|
||||
adduser postfix opendkim 2> "$log_file"
|
||||
adduser postfix opendkim > "$log_file" 2>&1
|
||||
if [[ $? -eq 0 ]] ; then
|
||||
echo_ok
|
||||
else
|
||||
@ -168,9 +180,9 @@ fi
|
||||
# -
|
||||
echononl " Create OpenDKIM configuration"
|
||||
if [[ -f "$opendkim_conf_file" ]] \
|
||||
&& grep -i -q -E "Socket\s+local:$opendkim_socket_file" "$opendkim_conf_file" \
|
||||
&& grep -i -q -E "SigningTable.*${opendkim_base_dir}/signing.table" "$opendkim_conf_file" \
|
||||
&& grep -i -q -E "KeyTable.*${opendkim_base_dir}/key.table" "$opendkim_conf_file" ; then
|
||||
&& grep -i -q -E "^\s*Socket\s+local:$opendkim_socket_file" "$opendkim_conf_file" \
|
||||
&& grep -i -q -E "^\s*SigningTable.*${opendkim_base_dir}/signing.table" "$opendkim_conf_file" \
|
||||
&& grep -i -q -E "^\s*KeyTable.*${opendkim_base_dir}/key.table" "$opendkim_conf_file" ; then
|
||||
echo_skipped
|
||||
warn "OpenDKIM seems already be configured."
|
||||
else
|
||||
@ -184,6 +196,7 @@ Mode sv
|
||||
# Socket local:/var/run/opendkim/opendkim.sock
|
||||
# Socket local:$opendkim_socket_file
|
||||
# Socket inet:12345@localhost
|
||||
Socket local:$opendkim_socket_file
|
||||
|
||||
# OpenDKIM verwendet diesen Benutzer bzw.
|
||||
# diese Gruppe
|
||||
|
Loading…
Reference in New Issue
Block a user