diff --git a/create_opendkim_key.sh b/create_opendkim_key.sh index 916a02e..62b8b0f 100755 --- a/create_opendkim_key.sh +++ b/create_opendkim_key.sh @@ -523,7 +523,7 @@ if $update_dns && [[ -z "$update_zone" ]] ; then fi if $update_dns && [[ -z "$key_secret" ]] ; then fatal "No secret for the update key used by nsupdate is given!" -else +elif [[ -z "$key_secret" ]] ; then key_secret="${DEFAULT_key_secret}" fi if $update_dns && [[ -z "$key_algo" ]]; then @@ -1210,6 +1210,20 @@ else error "$(cat $log_file)" 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 # - @@ -1236,6 +1250,7 @@ while IFS='' read -r _line || [[ -n $_line ]] ; do echo "" >> ${key_dir}/${dkim_selector}.bind9 echo -n " \"$_line\"" >> ${key_dir}/${dkim_selector}.bind9 + done < "${key_dir}/${dkim_selector}.public" echo " )" >> ${key_dir}/${dkim_selector}.bind9 echo_ok