Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
5d943a35
Commit
5d943a35
authored
Feb 14, 2017
by
neilpang
Browse files
fix
https://github.com/Neilpang/acme.sh/issues/616
parent
03f8d6e9
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
5d943a35
...
...
@@ -2442,14 +2442,14 @@ _isRealNginxConf() {
#restore all the nginx conf
_restoreNginx
()
{
if
[
-z
"
$NGINX_VLIST
"
]
;
then
if
[
-z
"
$NGINX_
RESTORE_
VLIST
"
]
;
then
_debug
"No need to restore nginx, skip."
return
fi
_debug
"_restoreNginx"
_debug
"NGINX_VLIST"
"
$NGINX_VLIST
"
_debug
"NGINX_
RESTORE_
VLIST"
"
$NGINX_
RESTORE_
VLIST
"
for
ng_entry
in
$(
echo
"
$NGINX_VLIST
"
|
tr
"
$dvsep
"
' '
)
;
do
for
ng_entry
in
$(
echo
"
$NGINX_
RESTORE_
VLIST
"
|
tr
"
$dvsep
"
' '
)
;
do
_debug
"ng_entry"
"
$ng_entry
"
_nd
=
$(
echo
"
$ng_entry
"
|
cut
-d
"
$sep
"
-f
1
)
_ngconf
=
$(
echo
"
$ng_entry
"
|
cut
-d
"
$sep
"
-f
2
)
...
...
@@ -3162,7 +3162,7 @@ issue() {
_sleep
"
$Le_DNSSleep
"
fi
NGINX_VLIST
=
""
NGINX_
RESTORE_
VLIST
=
""
_debug
"ok, let's start to verify"
_ncIndex
=
1
...
...
@@ -3220,7 +3220,7 @@ issue() {
_realConf
=
"
$FOUND_REAL_NGINX_CONF
"
_backup
=
"
$BACKUP_NGINX_CONF
"
_debug _realConf
"
$_realConf
"
NGINX_
VLIST
=
"
$NGINX
_VLIST$d$sep$_realConf$sep$_backup$dvsep
"
NGINX_
RESTORE
_VLIST
=
"
$d$sep$_realConf$sep$_backup$dvsep
$NGINX_RESTORE_VLIST
"
fi
_sleep 1
else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment