Commit d29aa43b authored by neil's avatar neil Committed by GitHub
Browse files

Merge pull request #869 from Neilpang/dev

Dev
parents 4e3c82e3 450efea1
...@@ -2665,13 +2665,15 @@ _isRealNginxConf() { ...@@ -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 else
fi
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment