mirror of
https://github.com/plantroon/acme.sh.git
synced 2024-12-22 21:21:42 +00:00
support "server" for renew and renewall
This commit is contained in:
parent
619bae745b
commit
8b7a86bd17
32
acme.sh
32
acme.sh
@ -5244,17 +5244,18 @@ _split_cert_chain() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
#domain [isEcc]
|
#domain [isEcc] [server]
|
||||||
renew() {
|
renew() {
|
||||||
Le_Domain="$1"
|
Le_Domain="$1"
|
||||||
if [ -z "$Le_Domain" ]; then
|
if [ -z "$Le_Domain" ]; then
|
||||||
_usage "Usage: $PROJECT_ENTRY --renew --domain <domain.tld> [--ecc]"
|
_usage "Usage: $PROJECT_ENTRY --renew --domain <domain.tld> [--ecc] [--server server]"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
_isEcc="$2"
|
_isEcc="$2"
|
||||||
#the server specified from commandline
|
_renewServer="$3"
|
||||||
_acme_server_back="$ACME_DIRECTORY"
|
_debug "_renewServer" "$_renewServer"
|
||||||
|
|
||||||
_initpath "$Le_Domain" "$_isEcc"
|
_initpath "$Le_Domain" "$_isEcc"
|
||||||
_set_level=${NOTIFY_LEVEL:-$NOTIFY_LEVEL_DEFAULT}
|
_set_level=${NOTIFY_LEVEL:-$NOTIFY_LEVEL_DEFAULT}
|
||||||
_info "$(__green "Renew: '$Le_Domain'")"
|
_info "$(__green "Renew: '$Le_Domain'")"
|
||||||
@ -5269,14 +5270,9 @@ renew() {
|
|||||||
|
|
||||||
. "$DOMAIN_CONF"
|
. "$DOMAIN_CONF"
|
||||||
_debug Le_API "$Le_API"
|
_debug Le_API "$Le_API"
|
||||||
if [ -z "$Le_API" ] || [ "$CA_LETSENCRYPT_V1" = "$Le_API" ]; then
|
|
||||||
#if this is from an old version, Le_API is empty,
|
|
||||||
#so, we force to use letsencrypt server
|
|
||||||
Le_API="$CA_LETSENCRYPT_V2"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ "$_acme_server_back" ]; then
|
if [ "$_renewServer" ]; then
|
||||||
export ACME_DIRECTORY="$_acme_server_back"
|
export ACME_DIRECTORY="$_renewServer"
|
||||||
else
|
else
|
||||||
export ACME_DIRECTORY="$Le_API"
|
export ACME_DIRECTORY="$Le_API"
|
||||||
fi
|
fi
|
||||||
@ -5299,6 +5295,7 @@ renew() {
|
|||||||
if [ "$Le_API" ] && [ "$ACME_DIRECTORY" ]; then
|
if [ "$Le_API" ] && [ "$ACME_DIRECTORY" ]; then
|
||||||
if [ "$Le_API" != "$ACME_DIRECTORY" ]; then
|
if [ "$Le_API" != "$ACME_DIRECTORY" ]; then
|
||||||
_clearAPI
|
_clearAPI
|
||||||
|
_clearCA
|
||||||
fi
|
fi
|
||||||
#reload ca configs
|
#reload ca configs
|
||||||
ACCOUNT_KEY_PATH=""
|
ACCOUNT_KEY_PATH=""
|
||||||
@ -5361,12 +5358,16 @@ renew() {
|
|||||||
return "$res"
|
return "$res"
|
||||||
}
|
}
|
||||||
|
|
||||||
#renewAll [stopRenewOnError]
|
#renewAll [stopRenewOnError] [server]
|
||||||
renewAll() {
|
renewAll() {
|
||||||
_initpath
|
_initpath
|
||||||
_clearCA
|
_clearCA
|
||||||
_stopRenewOnError="$1"
|
_stopRenewOnError="$1"
|
||||||
_debug "_stopRenewOnError" "$_stopRenewOnError"
|
_debug "_stopRenewOnError" "$_stopRenewOnError"
|
||||||
|
|
||||||
|
_server="$2"
|
||||||
|
_debug "_server" "$_server"
|
||||||
|
|
||||||
_ret="0"
|
_ret="0"
|
||||||
_success_msg=""
|
_success_msg=""
|
||||||
_error_msg=""
|
_error_msg=""
|
||||||
@ -5389,7 +5390,7 @@ renewAll() {
|
|||||||
_isEcc=$(echo "$d" | cut -d "$ECC_SEP" -f 2)
|
_isEcc=$(echo "$d" | cut -d "$ECC_SEP" -f 2)
|
||||||
d=$(echo "$d" | cut -d "$ECC_SEP" -f 1)
|
d=$(echo "$d" | cut -d "$ECC_SEP" -f 1)
|
||||||
fi
|
fi
|
||||||
renew "$d" "$_isEcc"
|
renew "$d" "$_isEcc" "$_server"
|
||||||
)
|
)
|
||||||
rc="$?"
|
rc="$?"
|
||||||
_debug "Return code: $rc"
|
_debug "Return code: $rc"
|
||||||
@ -7662,6 +7663,7 @@ _process() {
|
|||||||
|
|
||||||
if [ "$_server" ]; then
|
if [ "$_server" ]; then
|
||||||
_selectServer "$_server" "${_ecc:-$_keylength}"
|
_selectServer "$_server" "${_ecc:-$_keylength}"
|
||||||
|
_server="$ACME_DIRECTORY"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${_CMD}" != "install" ]; then
|
if [ "${_CMD}" != "install" ]; then
|
||||||
@ -7736,10 +7738,10 @@ _process() {
|
|||||||
installcert "$_domain" "$_cert_file" "$_key_file" "$_ca_file" "$_reloadcmd" "$_fullchain_file" "$_ecc"
|
installcert "$_domain" "$_cert_file" "$_key_file" "$_ca_file" "$_reloadcmd" "$_fullchain_file" "$_ecc"
|
||||||
;;
|
;;
|
||||||
renew)
|
renew)
|
||||||
renew "$_domain" "$_ecc"
|
renew "$_domain" "$_ecc" "$_server"
|
||||||
;;
|
;;
|
||||||
renewAll)
|
renewAll)
|
||||||
renewAll "$_stopRenewOnError"
|
renewAll "$_stopRenewOnError" "$_server"
|
||||||
;;
|
;;
|
||||||
revoke)
|
revoke)
|
||||||
revoke "$_domain" "$_ecc" "$_revoke_reason"
|
revoke "$_domain" "$_ecc" "$_revoke_reason"
|
||||||
|
Loading…
Reference in New Issue
Block a user