flywithu/acme.sh
1
0
Fork 0
mirror of https://github.com/hiskang/acme.sh synced 2025-10-31 02:17:18 +00:00
Code Issues Releases Wiki Activity

Merge pull request #370 from Neilpang/dev

Browse Source 
add APACHE_HTTPD_CONF
This commit is contained in:
neil 2016-11-06 23:27:42 +08:00 committed by GitHub
commit a9b4a2a1ac
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
acme.sh
View File

@ -1808,22 +1808,28 @@ _apachePath() {
return 1 return 1
fi fi
httpdconfname="$($_APACHECTL -V | grep SERVER_CONFIG_FILE= | cut -d = -f 2 | tr -d '"' )" if [ "$APACHE_HTTPD_CONF" ] ; then
_debug httpdconfname "$httpdconfname" _saveaccountconf APACHE_HTTPD_CONF "$APACHE_HTTPD_CONF"
httpdconf="$APACHE_HTTPD_CONF"
if [ -z "$httpdconfname" ] ; then
_err "Can not read apache config file."
return 1
fi
if _startswith "$httpdconfname" '/' ; then
httpdconf="$httpdconfname"
httpdconfname="$(basename $httpdconfname)" httpdconfname="$(basename $httpdconfname)"
else else
httpdroot="$($_APACHECTL -V | grep HTTPD_ROOT= | cut -d = -f 2 | tr -d '"' )" httpdconfname="$($_APACHECTL -V | grep SERVER_CONFIG_FILE= | cut -d = -f 2 | tr -d '"' )"
_debug httpdroot "$httpdroot" _debug httpdconfname "$httpdconfname"
httpdconf="$httpdroot/$httpdconfname"
httpdconfname="$(basename $httpdconfname)" if [ -z "$httpdconfname" ] ; then
_err "Can not read apache config file."
return 1
fi
if _startswith "$httpdconfname" '/' ; then
httpdconf="$httpdconfname"
httpdconfname="$(basename $httpdconfname)"
else
httpdroot="$($_APACHECTL -V | grep HTTPD_ROOT= | cut -d = -f 2 | tr -d '"' )"
_debug httpdroot "$httpdroot"
httpdconf="$httpdroot/$httpdconfname"
httpdconfname="$(basename $httpdconfname)"
fi
fi fi
_debug httpdconf "$httpdconf" _debug httpdconf "$httpdconf"
_debug httpdconfname "$httpdconfname" _debug httpdconfname "$httpdconfname"