plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-12-25 14:41:40 +00:00
Code Issues Projects 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

6
acme.sh
View File

@ -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() {
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