Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
5378d9ca
Commit
5378d9ca
authored
Mar 08, 2017
by
neil
Browse files
fix nginx mode
parent
6fb2a1ed
Changes
1
Show whitespace changes
Inline
Side-by-side
acme.sh
View file @
5378d9ca
...
@@ -2462,7 +2462,7 @@ _setNginx() {
...
@@ -2462,7 +2462,7 @@ _setNginx() {
fi
fi
_debug
"Start detect nginx conf for
$_d
from:
$_start_f
"
_debug
"Start detect nginx conf for
$_d
from:
$_start_f
"
if
!
_checkConf
"
$_d
"
"
$_start_f
"
;
then
if
!
_checkConf
"
$_d
"
"
$_start_f
"
;
then
"Can not find conf file for domain
$d
"
_err
"Can not find conf file for domain
$d
"
return
1
return
1
fi
fi
_info
"Found conf file:
$FOUND_REAL_NGINX_CONF
"
_info
"Found conf file:
$FOUND_REAL_NGINX_CONF
"
...
@@ -2559,7 +2559,7 @@ _checkConf() {
...
@@ -2559,7 +2559,7 @@ _checkConf() {
FOUND_REAL_NGINX_CONF
=
"
$2
"
FOUND_REAL_NGINX_CONF
=
"
$2
"
return
0
return
0
fi
fi
if
grep
"^ *include *.*;"
"
$2
"
>
/dev/null
;
then
if
cat
"
$2
"
|
tr
"
\t
"
" "
|
grep
"^ *include *.*;"
>
/dev/null
;
then
_debug
"Try include files"
_debug
"Try include files"
for
included
in
$(
grep
"^ *include *.*;"
"
$2
"
|
sed
"s/include //"
|
tr
-d
" ;"
)
;
do
for
included
in
$(
grep
"^ *include *.*;"
"
$2
"
|
sed
"s/include //"
|
tr
-d
" ;"
)
;
do
_debug
"check included
$included
"
_debug
"check included
$included
"
...
...
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