plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-11-14 02:11:45 +00:00
Code Issues Projects Releases Wiki Activity

fix apache error checks

Browse Source
This commit is contained in:
neilpang 2016-11-01 20:29:58 +08:00
parent 7e512bad96
commit 610e0f21d6
1 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
acme.sh
View File

@ -918,15 +918,18 @@ _time() {
_mktemp() { _mktemp() {
if _exists mktemp ; then if _exists mktemp ; then
if mktemp 2>/dev/null ; then if mktemp 2>/dev/null ; then
return return 0
elif _contains "$(mktemp 2>&1)" "-t prefix" && mktemp -t "$PROJECT_NAME" 2>/dev/null ; then elif _contains "$(mktemp 2>&1)" "-t prefix" && mktemp -t "$PROJECT_NAME" 2>/dev/null ; then
#for Mac osx #for Mac osx
return return 0
fi fi
fi fi
if [ -d "/tmp" ] ; then if [ -d "/tmp" ] ; then
echo "/tmp/${PROJECT_NAME}wefADf24sf.$(_time).tmp" echo "/tmp/${PROJECT_NAME}wefADf24sf.$(_time).tmp"
return 0 return 0
elif [ "$LE_TEMP_DIR" ] && mkdir -p "$LE_TEMP_DIR" ; then
echo "/$LE_TEMP_DIR/wefADf24sf.$(_time).tmp"
return 0
fi fi
_err "Can not create temp file." _err "Can not create temp file."
} }
@ -1540,6 +1543,10 @@ __initHome() {
DEFAULT_LOG_FILE="$LE_WORKING_DIR/$PROJECT_NAME.log" DEFAULT_LOG_FILE="$LE_WORKING_DIR/$PROJECT_NAME.log"
DEFAULT_CA_HOME="$LE_WORKING_DIR/ca" DEFAULT_CA_HOME="$LE_WORKING_DIR/ca"
if [ -z "$LE_TEMP_DIR" ] ; then
LE_TEMP_DIR="$LE_WORKING_DIR/tmp"
fi
} }
#[domain] [keylength] #[domain] [keylength]
@ -1693,6 +1700,21 @@ _initpath() {
} }
_exec() {
if [ -z "$_EXEC_TEMP_ERR" ] ; then
_EXEC_TEMP_ERR="$(_mktemp)"
fi
if [ "$_EXEC_TEMP_ERR" ] ; then
"$@" 2>"$_EXEC_TEMP_ERR"
else
"$@"
fi
}
_exec_err() {
[ "$_EXEC_TEMP_ERR" ] && _err "$(cat "$_EXEC_TEMP_ERR")"
}
_apachePath() { _apachePath() {
_APACHECTL="apachectl" _APACHECTL="apachectl"
@ -1705,8 +1727,20 @@ _apachePath() {
return 1 return 1
fi fi
fi fi
if ! _exec $_APACHECTL -V ; then
_exec_err
return 1
fi
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"
if [ -z "$httpdconfname" ] ; then
_err "Can not read apache config file."
return 1
fi
if _startswith "$httpdconfname" '/' ; then if _startswith "$httpdconfname" '/' ; then
httpdconf="$httpdconfname" httpdconf="$httpdconfname"
httpdconfname="$(basename $httpdconfname)" httpdconfname="$(basename $httpdconfname)"
@ -1741,7 +1775,8 @@ _restoreApache() {
cat "$APACHE_CONF_BACKUP_DIR/$httpdconfname" > "$httpdconf" cat "$APACHE_CONF_BACKUP_DIR/$httpdconfname" > "$httpdconf"
_debug "Restored: $httpdconf." _debug "Restored: $httpdconf."
if ! $_APACHECTL -t >/dev/null 2>&1 ; then if ! _exec $_APACHECTL -t ; then
_exec_err
_err "Sorry, restore apache config error, please contact me." _err "Sorry, restore apache config error, please contact me."
return 1; return 1;
fi fi
@ -1758,11 +1793,11 @@ _setApache() {
#test the conf first #test the conf first
_info "Checking if there is an error in the apache config file before starting." _info "Checking if there is an error in the apache config file before starting."
_msg="$($_APACHECTL -t 2>&1 )"
if [ "$?" != "0" ] ; then if ! _exec $_APACHECTL -t >/dev/null ; then
_err "Sorry, apache config file has error, please fix it first, then try again." _exec_err
_err "The apache config file has error, please fix it first, then try again."
_err "Don't worry, there is nothing changed to your system." _err "Don't worry, there is nothing changed to your system."
_err "$_msg"
return 1; return 1;
else else
_info "OK" _info "OK"
@ -1821,8 +1856,9 @@ Allow from all
chmod 755 "$ACME_DIR" chmod 755 "$ACME_DIR"
fi fi
if ! $_APACHECTL graceful ; then if ! _exec $_APACHECTL graceful ; then
_err "Sorry, $_APACHECTL graceful error, please contact me." _exec_err
_err "$_APACHECTL graceful error, please contact me."
_restoreApache _restoreApache
return 1; return 1;
fi fi