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
eb2a26cf
Commit
eb2a26cf
authored
Mar 08, 2017
by
neil
Committed by
GitHub
Mar 08, 2017
Browse files
Merge pull request #708 from Neilpang/dev
fix nginx mode
parents
e538a13e
5378d9ca
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
eb2a26cf
...
...
@@ -2462,7 +2462,7 @@ _setNginx() {
fi
_debug "Start detect nginx conf for $_d from:$_start_f"
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
fi
_info "Found conf file: $FOUND_REAL_NGINX_CONF"
...
...
@@ -2559,7 +2559,7 @@ _checkConf() {
FOUND_REAL_NGINX_CONF="$2"
return 0
fi
if
grep
"^ *include *.*;"
"
$2
"
>
/dev/null
;
then
if
cat "$2" | tr "\t" " " |
grep "^ *include *.*;" >/dev/null; then
_debug "Try include files"
for included in $(grep "^ *include *.*;" "$2" | sed "s/include //" | tr -d " ;"); do
_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