Browse Source

Merge pull request #869 from Neilpang/dev

Dev
pull/790/merge
neil 8 years ago
committed by GitHub
parent
commit
d29aa43ba4
  1. 8
      acme.sh

8
acme.sh

@ -2665,13 +2665,15 @@ _isRealNginxConf() {
_debug "_seg_n" "$_seg_n" _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" _debug "ssl on, skip"
return 1
fi
else
FOUND_REAL_NGINX_CONF_LN=$_fln FOUND_REAL_NGINX_CONF_LN=$_fln
_debug3 "found FOUND_REAL_NGINX_CONF_LN" "$FOUND_REAL_NGINX_CONF_LN"
return 0 return 0
fi fi
fi
done done
fi fi
return 1 return 1

Loading…
Cancel
Save