Browse Source

Merge 5cc3843b86 into 3881f22192

pull/1358/merge
Marcel Krüger 8 years ago
committed by GitHub
parent
commit
a6abf14761
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      acme.sh

20
acme.sh

@ -3019,11 +3019,17 @@ _on_before_issue() {
_debug Le_LocalAddress "$_chk_local_addr" _debug Le_LocalAddress "$_chk_local_addr"
alldomains=$(echo "$_chk_main_domain,$_chk_alt_domains" | tr ',' ' ')
remainingdomains="$_chk_main_domain,$_chk_alt_domains"
_index=1 _index=1
_currentRoot="" _currentRoot=""
_addrIndex=1 _addrIndex=1
for d in $alldomains; do
while [ "$remainingdomains" ]; do
d="${remainingdomains%%,*}"
if [ "$remainingdomains" = "$d" ]; then
remainingdomains=""
else
remainingdomains="${remainingdomains#*,}"
fi
_debug "Check for domain" "$d" _debug "Check for domain" "$d"
_currentRoot="$(_getfield "$_chk_web_roots" $_index)" _currentRoot="$(_getfield "$_chk_web_roots" $_index)"
_debug "_currentRoot" "$_currentRoot" _debug "_currentRoot" "$_currentRoot"
@ -3610,10 +3616,16 @@ $_authorizations_map"
_debug2 _authorizations_map "$_authorizations_map" _debug2 _authorizations_map "$_authorizations_map"
fi fi
alldomains=$(echo "$_main_domain,$_alt_domains" | tr ',' ' ')
remainingdomains="$_main_domain,$_alt_domains"
_index=0 _index=0
_currentRoot="" _currentRoot=""
for d in $alldomains; do
while [ "$remainingdomains" ]; do
d="${remainingdomains%%,*}"
if [ "$remainingdomains" = "$d" ]; then
remainingdomains=""
else
remainingdomains="${remainingdomains#*,}"
fi
_info "Getting webroot for domain" "$d" _info "Getting webroot for domain" "$d"
_index=$(_math $_index + 1) _index=$(_math $_index + 1)
_w="$(echo $_web_roots | cut -d , -f $_index)" _w="$(echo $_web_roots | cut -d , -f $_index)"

Loading…
Cancel
Save