Browse Source

Fix dns record formate when request wildcard domain certificate

pull/369/head
Sheng-Han Tzeng 8 years ago
parent
commit
1e64dce57a
1 changed files with 9 additions and 9 deletions
  1. +9
    -9
      getssl

+ 9
- 9
getssl View File

@ -498,7 +498,7 @@ clean_up() { # Perform pre-exit housekeeping
# shellcheck source=/dev/null # shellcheck source=/dev/null
. "$dnsfile" . "$dnsfile"
debug "attempting to clean up DNS entry for $d" debug "attempting to clean up DNS entry for $d"
eval "$DNS_DEL_COMMAND" "$d" "$auth_key"
eval "$DNS_DEL_COMMAND" "${d/\*\./}" "$auth_key"
done done
shopt -u nullglob shopt -u nullglob
fi fi
@ -2188,14 +2188,14 @@ for d in $alldomains; do
| sed -e 's:=*$::g' -e 'y:+/:-_:') | sed -e 's:=*$::g' -e 'y:+/:-_:')
debug auth_key "$auth_key" debug auth_key "$auth_key"
debug "adding dns via command: $DNS_ADD_COMMAND $d $auth_key"
if ! eval "$DNS_ADD_COMMAND" "$d" "$auth_key" ; then
debug "adding dns via command: $DNS_ADD_COMMAND ${d/\*\./} $auth_key"
if ! eval "$DNS_ADD_COMMAND" "${d/\*\./}" "$auth_key" ; then
error_exit "DNS_ADD_COMMAND failed for domain $d" error_exit "DNS_ADD_COMMAND failed for domain $d"
fi fi
# find a primary / authoritative DNS server for the domain # find a primary / authoritative DNS server for the domain
if [[ -z "$AUTH_DNS_SERVER" ]]; then if [[ -z "$AUTH_DNS_SERVER" ]]; then
get_auth_dns "$d"
get_auth_dns "${d/\*\./}"
else else
primary_ns="$AUTH_DNS_SERVER" primary_ns="$AUTH_DNS_SERVER"
fi fi
@ -2320,17 +2320,17 @@ if [[ $VALIDATE_VIA_DNS == "true" ]]; then
check_dns="fail" check_dns="fail"
while [[ "$check_dns" == "fail" ]]; do while [[ "$check_dns" == "fail" ]]; do
if [[ "$os" == "cygwin" ]]; then if [[ "$os" == "cygwin" ]]; then
check_result=$(nslookup -type=txt "_acme-challenge.${d}" "${ns}" \
check_result=$(nslookup -type=txt "_acme-challenge.${d/\*\./}" "${ns}" \
| grep ^_acme -A2\ | grep ^_acme -A2\
| grep '"'|awk -F'"' '{ print $2}') | grep '"'|awk -F'"' '{ print $2}')
elif [[ "$DNS_CHECK_FUNC" == "drill" ]] || [[ "$DNS_CHECK_FUNC" == "dig" ]]; then elif [[ "$DNS_CHECK_FUNC" == "drill" ]] || [[ "$DNS_CHECK_FUNC" == "dig" ]]; then
check_result=$($DNS_CHECK_FUNC TXT "_acme-challenge.${d}" "@${ns}" \
check_result=$($DNS_CHECK_FUNC TXT "_acme-challenge.${d/\*\./}" "@${ns}" \
| grep ^_acme|awk -F'"' '{ print $2}') | grep ^_acme|awk -F'"' '{ print $2}')
elif [[ "$DNS_CHECK_FUNC" == "host" ]]; then elif [[ "$DNS_CHECK_FUNC" == "host" ]]; then
check_result=$($DNS_CHECK_FUNC -t TXT "_acme-challenge.${d}" "${ns}" \
check_result=$($DNS_CHECK_FUNC -t TXT "_acme-challenge.${d/\*\./}" "${ns}" \
| grep ^_acme|awk -F'"' '{ print $2}') | grep ^_acme|awk -F'"' '{ print $2}')
else else
check_result=$(nslookup -type=txt "_acme-challenge.${d}" "${ns}" \
check_result=$(nslookup -type=txt "_acme-challenge.${d/\*\./}" "${ns}" \
| grep ^_acme|awk -F'"' '{ print $2}') | grep ^_acme|awk -F'"' '{ print $2}')
fi fi
debug "expecting $auth_key" debug "expecting $auth_key"
@ -2369,7 +2369,7 @@ if [[ $VALIDATE_VIA_DNS == "true" ]]; then
check_challenge_completion "$uri" "$d" "$keyauthorization" check_challenge_completion "$uri" "$d" "$keyauthorization"
debug "remove DNS entry" debug "remove DNS entry"
eval "$DNS_DEL_COMMAND" "$d" "$auth_key"
eval "$DNS_DEL_COMMAND" "${d/\*\./}" "$auth_key"
# remove $dnsfile after each loop. # remove $dnsfile after each loop.
rm -f "$dnsfile" rm -f "$dnsfile"
fi fi


Loading…
Cancel
Save