Commit a9b4a2a1 authored by neil's avatar neil Committed by GitHub
Browse files

Merge pull request #370 from Neilpang/dev

add APACHE_HTTPD_CONF
parents 37d7f89c 5be1449d
......@@ -1808,6 +1808,11 @@ _apachePath() {
return 1
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 '"' )"
_debug httpdconfname "$httpdconfname"
......@@ -1825,6 +1830,7 @@ _apachePath() {
httpdconf="$httpdroot/$httpdconfname"
httpdconfname="$(basename $httpdconfname)"
fi
fi
_debug httpdconf "$httpdconf"
_debug httpdconfname "$httpdconfname"
if [ ! -f "$httpdconf" ] ; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment