Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
8b7a86bd
Commit
8b7a86bd
authored
May 09, 2022
by
neil
Browse files
support "server" for renew and renewall
parent
619bae74
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
8b7a86bd
...
@@ -5244,17 +5244,18 @@ _split_cert_chain() {
...
@@ -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() {
...
@@ -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() {
...
@@ -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() {
...
@@ -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() {
...
@@ -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() {
...
@@ -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() {
...
@@ -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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment