ervin/acme.sh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 0a011d4f6f into 4e2426a2b4

Browse Source
This commit is contained in:
dakanji 2017-04-21 15:47:05 +00:00 committed by GitHub
commit f3b6b97fa9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
acme.sh
View File

@ -3332,6 +3332,7 @@ issue() {
done done
_debug vlist "$vlist" _debug vlist "$vlist"
#add entry #add entry
alldomains=""
dnsadded="" dnsadded=""
ventries=$(echo "$vlist" | tr "$dvsep" ' ') ventries=$(echo "$vlist" | tr "$dvsep" ' ')
for ventry in $ventries; do for ventry in $ventries; do
@ -3346,6 +3347,7 @@ issue() {
fi fi
if [ "$vtype" = "$VTYPE_DNS" ]; then if [ "$vtype" = "$VTYPE_DNS" ]; then
alldomains="-d $d $alldomains"
dnsadded='0' dnsadded='0'
txtdomain="_acme-challenge.$d" txtdomain="_acme-challenge.$d"
_debug txtdomain "$txtdomain" _debug txtdomain "$txtdomain"
@ -3362,7 +3364,7 @@ issue() {
_err "Add the following TXT record:" _err "Add the following TXT record:"
_err "Domain: '$(__green "$txtdomain")'" _err "Domain: '$(__green "$txtdomain")'"
_err "TXT value: '$(__green "$txt")'" _err "TXT value: '$(__green "$txt")'"
_err "Please be aware that you prepend _acme-challenge. before your domain" _err "Please ensure you prepend _acme-challenge before your domain name"
_err "so the resulting subdomain will be: $txtdomain" _err "so the resulting subdomain will be: $txtdomain"
continue continue
fi fi
@ -3396,8 +3398,8 @@ issue() {
if [ "$dnsadded" = '0' ]; then if [ "$dnsadded" = '0' ]; then
_savedomainconf "Le_Vlist" "$vlist" _savedomainconf "Le_Vlist" "$vlist"
_debug "Dns record not added yet, so, save to $DOMAIN_CONF and exit." _debug "DNS record not added yet, so, save to $DOMAIN_CONF and exit."
_err "Please add the TXT records to the domains, and retry again." _err "Update the DNS TXT records and run: $(__green "acme.sh --renew $alldomains")"
_clearup _clearup
_on_issue_err "$_post_hook" _on_issue_err "$_post_hook"
return 1 return 1