Merge pull request #869 from Neilpang/dev

Dev
8 years ago · d29aa43ba4
1 changed files with 6 additions and 4 deletions
--- a/acme.sh
+++ b/acme.sh
@ -2665,13 +2665,15 @@ _isRealNginxConf() {

        _debug "_seg_n" "$_seg_n"

-        if [ "$(echo "$_seg_n" | _egrep_o "^ *ssl  *on *;")" ]; then
+        if [ "$(echo "$_seg_n" | _egrep_o "^ *ssl  *on *;")" ] \
+          || [ "$(echo "$_seg_n" | _egrep_o "listen .* ssl[ |;]")" ]; then
          _debug "ssl on, skip"
-          return 1
-        fi
+        else
          FOUND_REAL_NGINX_CONF_LN=$_fln
+          _debug3 "found FOUND_REAL_NGINX_CONF_LN" "$FOUND_REAL_NGINX_CONF_LN"
          return 0
        fi
+      fi
    done
  fi
  return 1