|
|
@ -412,9 +412,6 @@ _initpath() {
|
|
|
|
if [ -z "$CA_CERT_PATH" ] ; then
|
|
|
|
if [ -z "$CA_CERT_PATH" ] ; then
|
|
|
|
CA_CERT_PATH="$domainhome/ca.cer"
|
|
|
|
CA_CERT_PATH="$domainhome/ca.cer"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if [ -z "$POST_RENEW_PATH" ] ; then
|
|
|
|
|
|
|
|
POST_RENEW_PATH="$domainhome/post-renew.sh"
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -962,9 +959,6 @@ renew() {
|
|
|
|
local res=$?
|
|
|
|
local res=$?
|
|
|
|
IS_RENEW=""
|
|
|
|
IS_RENEW=""
|
|
|
|
|
|
|
|
|
|
|
|
if [ -x "$POST_RENEW_PATH" -a "$res" -eq "0" ] ; then
|
|
|
|
|
|
|
|
(cd $DOMAIN_PATH && exec $POST_RENEW_PATH)
|
|
|
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
return $res
|
|
|
|
return $res
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -996,15 +990,14 @@ renewAll() {
|
|
|
|
|
|
|
|
|
|
|
|
Le_ReloadCmd=""
|
|
|
|
Le_ReloadCmd=""
|
|
|
|
|
|
|
|
|
|
|
|
DOMAIN_CONF=""
|
|
|
|
|
|
|
|
DOMAIN_PATH=""
|
|
|
|
DOMAIN_PATH=""
|
|
|
|
|
|
|
|
DOMAIN_CONF=""
|
|
|
|
DOMAIN_SSL_CONF=""
|
|
|
|
DOMAIN_SSL_CONF=""
|
|
|
|
CSR_PATH=""
|
|
|
|
CSR_PATH=""
|
|
|
|
CERT_KEY_PATH=""
|
|
|
|
CERT_KEY_PATH=""
|
|
|
|
CERT_PATH=""
|
|
|
|
CERT_PATH=""
|
|
|
|
CA_CERT_PATH=""
|
|
|
|
CA_CERT_PATH=""
|
|
|
|
ACCOUNT_KEY_PATH=""
|
|
|
|
ACCOUNT_KEY_PATH=""
|
|
|
|
POST_RENEW_PATH=""
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
wellknown_path=""
|
|
|
|
wellknown_path=""
|
|
|
|
|
|
|
|
|
|
|
@ -1061,7 +1054,7 @@ installcert() {
|
|
|
|
|
|
|
|
|
|
|
|
if [ "$Le_ReloadCmd" ] ; then
|
|
|
|
if [ "$Le_ReloadCmd" ] ; then
|
|
|
|
_info "Run Le_ReloadCmd: $Le_ReloadCmd"
|
|
|
|
_info "Run Le_ReloadCmd: $Le_ReloadCmd"
|
|
|
|
eval $Le_ReloadCmd
|
|
|
|
(cd $DOMAIN_PATH && eval $Le_ReloadCmd)
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|