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
f08a79d3
Commit
f08a79d3
authored
Mar 08, 2017
by
neil
Browse files
fix nginx mode
parent
5378d9ca
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
f08a79d3
...
@@ -2546,7 +2546,7 @@ _checkConf() {
...
@@ -2546,7 +2546,7 @@ _checkConf() {
if [ ! -f "$2" ] && ! echo "$2" | grep '*$' >/dev/null && echo "$2" | grep '*' >/dev/null; then
if [ ! -f "$2" ] && ! echo "$2" | grep '*$' >/dev/null && echo "$2" | grep '*' >/dev/null; then
_debug "wildcard"
_debug "wildcard"
for _w_f in $2; do
for _w_f in $2; do
if
_checkConf
"
$1
"
"
$_w_f
"
;
then
if
[ -f "$_w_f"] &&
_checkConf "$1" "$_w_f"; then
return 0
return 0
fi
fi
done
done
...
@@ -2559,9 +2559,9 @@ _checkConf() {
...
@@ -2559,9 +2559,9 @@ _checkConf() {
FOUND_REAL_NGINX_CONF="$2"
FOUND_REAL_NGINX_CONF="$2"
return 0
return 0
fi
fi
if
cat
"
$2
"
|
tr
"
\t
"
" "
|
grep
"^ *include *.*;"
>
/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 $(
cat "$2" | tr "\t" " " |
grep "^ *include *.*;" | sed "s/include //" | tr -d " ;"); do
_debug "check included $included"
_debug "check included $included"
if _checkConf "$1" "$included"; then
if _checkConf "$1" "$included"; then
return 0
return 0
...
...
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