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
5be1449d
Commit
5be1449d
authored
Nov 06, 2016
by
neilpang
Browse files
add APACHE_HTTPD_CONF
https://github.com/Neilpang/acme.sh/issues/363
parent
57e58ce7
Changes
1
Show whitespace changes
Inline
Side-by-side
acme.sh
View file @
5be1449d
...
@@ -1808,6 +1808,11 @@ _apachePath() {
...
@@ -1808,6 +1808,11 @@ _apachePath() {
return 1
return 1
fi
fi
if [ "$APACHE_HTTPD_CONF" ] ; then
_saveaccountconf APACHE_HTTPD_CONF "$APACHE_HTTPD_CONF"
httpdconf="$APACHE_HTTPD_CONF"
httpdconfname="$(basename $httpdconfname)"
else
httpdconfname="$($_APACHECTL -V | grep SERVER_CONFIG_FILE= | cut -d = -f 2 | tr -d '"' )"
httpdconfname="$($_APACHECTL -V | grep SERVER_CONFIG_FILE= | cut -d = -f 2 | tr -d '"' )"
_debug httpdconfname "$httpdconfname"
_debug httpdconfname "$httpdconfname"
...
@@ -1825,6 +1830,7 @@ _apachePath() {
...
@@ -1825,6 +1830,7 @@ _apachePath() {
httpdconf="$httpdroot/$httpdconfname"
httpdconf="$httpdroot/$httpdconfname"
httpdconfname="$(basename $httpdconfname)"
httpdconfname="$(basename $httpdconfname)"
fi
fi
fi
_debug httpdconf "$httpdconf"
_debug httpdconf "$httpdconf"
_debug httpdconfname "$httpdconfname"
_debug httpdconfname "$httpdconfname"
if [ ! -f "$httpdconf" ] ; then
if [ ! -f "$httpdconf" ] ; then
...
...
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