flywithu/acme.sh
1
0
Fork 0
mirror of https://github.com/hiskang/acme.sh synced 2025-10-31 02:17:18 +00:00
Code Issues Releases Wiki Activity

minor

Browse Source
This commit is contained in:
neilpang 2018-01-19 22:41:42 +08:00
parent 6ba4f8b54c
commit 37f39c0870
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
acme.sh
View File

@ -2548,10 +2548,7 @@ _setNginx() {
_d="$1" _d="$1"
_croot="$2" _croot="$2"
_thumbpt="$3" _thumbpt="$3"
if ! _exists "nginx"; then
_err "nginx command is not found."
return 1
fi
FOUND_REAL_NGINX_CONF="" FOUND_REAL_NGINX_CONF=""
FOUND_REAL_NGINX_CONF_LN="" FOUND_REAL_NGINX_CONF_LN=""
BACKUP_NGINX_CONF="" BACKUP_NGINX_CONF=""
@ -2561,6 +2558,10 @@ _setNginx() {
if [ -z "$_start_f" ]; then if [ -z "$_start_f" ]; then
_debug "find start conf from nginx command" _debug "find start conf from nginx command"
if [ -z "$NGINX_CONF" ]; then if [ -z "$NGINX_CONF" ]; then
if ! _exists "nginx"; then
_err "nginx command is not found."
return 1
fi
NGINX_CONF="$(nginx -V 2>&1 | _egrep_o "--conf-path=[^ ]* " | tr -d " ")" NGINX_CONF="$(nginx -V 2>&1 | _egrep_o "--conf-path=[^ ]* " | tr -d " ")"
_debug NGINX_CONF "$NGINX_CONF" _debug NGINX_CONF "$NGINX_CONF"
NGINX_CONF="$(echo "$NGINX_CONF" | cut -d = -f 2)" NGINX_CONF="$(echo "$NGINX_CONF" | cut -d = -f 2)"
@ -2605,6 +2606,10 @@ _setNginx() {
return 1 return 1
fi fi
if ! _exists "nginx"; then
_err "nginx command is not found."
return 1
fi
_info "Check the nginx conf before setting up." _info "Check the nginx conf before setting up."
if ! _exec "nginx -t" >/dev/null; then if ! _exec "nginx -t" >/dev/null; then
_exec_err _exec_err