Browse Source

fix bug: multi webroots

neil 9 years ago
parent
commit
6f93064114
1 changed files with 12 additions and 11 deletions
  1. 12 11
      acme.sh

+ 12 - 11
acme.sh

@@ -1009,7 +1009,6 @@ issue() {
       _err "set up apache error. Report error to me."
       _err "set up apache error. Report error to me."
       return 1
       return 1
     fi
     fi
-    wellknown_path="$ACME_DIR"
   else
   else
     usingApache=""
     usingApache=""
   fi
   fi
@@ -1242,19 +1241,21 @@ issue() {
         _debug serverproc $serverproc
         _debug serverproc $serverproc
 
 
       else
       else
-        if [[ -z "$wellknown_path" ]] ; then
+        if [[ "$_currentRoot" == "apache" ]] ; then
+          wellknown_path="$ACME_DIR"
+        else
           wellknown_path="$_currentRoot/.well-known/acme-challenge"
           wellknown_path="$_currentRoot/.well-known/acme-challenge"
+          if [[ ! -d "$_currentRoot/.well-known" ]] ; then 
+            removelevel='1'
+          elif [[ ! -d "$_currentRoot/.well-known/acme-challenge" ]] ; then 
+            removelevel='2'
+          else
+            removelevel='3'
+          fi
         fi
         fi
+
         _debug wellknown_path "$wellknown_path"
         _debug wellknown_path "$wellknown_path"
-        
-        if [[ ! -d "$_currentRoot/.well-known" ]] ; then 
-          removelevel='1'
-        elif [[ ! -d "$_currentRoot/.well-known/acme-challenge" ]] ; then 
-          removelevel='2'
-        else
-          removelevel='3'
-        fi
-        
+
         token="$(echo -e -n "$keyauthorization" | cut -d '.' -f 1)"
         token="$(echo -e -n "$keyauthorization" | cut -d '.' -f 1)"
         _debug "writing token:$token to $wellknown_path/$token"
         _debug "writing token:$token to $wellknown_path/$token"