install/postfix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add 'socket' option to opendkim.conf - debian stretch seems to ignore file '/etc/default/opendkim'.

Browse Source
This commit is contained in:
Christoph 2017-10-17 11:18:51 +02:00
parent 19f87a3d1a
commit 37b16e39d8
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
install_opendkim.sh
View File

@ -105,6 +105,18 @@ fi
echo "" 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 # - Install OpenDKIM
# - # -
echononl " Install needed debian packages.." 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 if grep opendkim /etc/group | grep -q postfix 2> /dev/null ; then
echo_skipped echo_skipped
else else
adduser postfix opendkim 2> "$log_file" adduser postfix opendkim > "$log_file" 2>&1
if [[ $? -eq 0 ]] ; then if [[ $? -eq 0 ]] ; then
echo_ok echo_ok
else else
@ -168,9 +180,9 @@ fi
# - # -
echononl " Create OpenDKIM configuration" echononl " Create OpenDKIM configuration"
if [[ -f "$opendkim_conf_file" ]] \ if [[ -f "$opendkim_conf_file" ]] \
&& grep -i -q -E "Socket\s+local:$opendkim_socket_file" "$opendkim_conf_file" \ && grep -i -q -E "^\s*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 "^\s*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*KeyTable.*${opendkim_base_dir}/key.table" "$opendkim_conf_file" ; then
echo_skipped echo_skipped
warn "OpenDKIM seems already be configured." warn "OpenDKIM seems already be configured."
else else
@ -184,6 +196,7 @@ Mode sv
# Socket local:/var/run/opendkim/opendkim.sock # Socket local:/var/run/opendkim/opendkim.sock
# Socket local:$opendkim_socket_file # Socket local:$opendkim_socket_file
# Socket inet:12345@localhost # Socket inet:12345@localhost
Socket local:$opendkim_socket_file
# OpenDKIM verwendet diesen Benutzer bzw. # OpenDKIM verwendet diesen Benutzer bzw.
# diese Gruppe # diese Gruppe