create_opendkim_key.sh: fix error: don't ignore secret key from configuration file; add file with public dkim key as one-liner.
This commit is contained in:
parent
1a4ed0053d
commit
3019f2d27a
@ -523,7 +523,7 @@ if $update_dns && [[ -z "$update_zone" ]] ; then
|
|||||||
fi
|
fi
|
||||||
if $update_dns && [[ -z "$key_secret" ]] ; then
|
if $update_dns && [[ -z "$key_secret" ]] ; then
|
||||||
fatal "No secret for the update key used by nsupdate is given!"
|
fatal "No secret for the update key used by nsupdate is given!"
|
||||||
else
|
elif [[ -z "$key_secret" ]] ; then
|
||||||
key_secret="${DEFAULT_key_secret}"
|
key_secret="${DEFAULT_key_secret}"
|
||||||
fi
|
fi
|
||||||
if $update_dns && [[ -z "$key_algo" ]]; then
|
if $update_dns && [[ -z "$key_algo" ]]; then
|
||||||
@ -1210,6 +1210,20 @@ else
|
|||||||
error "$(cat $log_file)"
|
error "$(cat $log_file)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echononl " Print out public key as one line.."
|
||||||
|
: > ${key_dir}/${dkim_selector}.public.one-line
|
||||||
|
while IFS='' read -r _line || [[ -n $_line ]] ; do
|
||||||
|
|
||||||
|
if echo "$_line" | grep -i -q -E "^---" 2> /dev/null ; then
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo -n "${_line}" >> ${key_dir}/${dkim_selector}.public.one-line
|
||||||
|
|
||||||
|
done < "${key_dir}/${dkim_selector}.public"
|
||||||
|
echo_ok
|
||||||
|
generated_files_arr+=("${key_dir}/${dkim_selector}.public.one-line")
|
||||||
|
|
||||||
|
|
||||||
# - Generate TXT record for use in bind9
|
# - Generate TXT record for use in bind9
|
||||||
# -
|
# -
|
||||||
@ -1236,6 +1250,7 @@ while IFS='' read -r _line || [[ -n $_line ]] ; do
|
|||||||
echo "" >> ${key_dir}/${dkim_selector}.bind9
|
echo "" >> ${key_dir}/${dkim_selector}.bind9
|
||||||
echo -n " \"$_line\"" >> ${key_dir}/${dkim_selector}.bind9
|
echo -n " \"$_line\"" >> ${key_dir}/${dkim_selector}.bind9
|
||||||
|
|
||||||
|
|
||||||
done < "${key_dir}/${dkim_selector}.public"
|
done < "${key_dir}/${dkim_selector}.public"
|
||||||
echo " )" >> ${key_dir}/${dkim_selector}.bind9
|
echo " )" >> ${key_dir}/${dkim_selector}.bind9
|
||||||
echo_ok
|
echo_ok
|
||||||
|
Loading…
x
Reference in New Issue
Block a user