mirror of
https://github.com/plantroon/acme.sh.git
synced 2024-11-10 00:11:45 +00:00
fix renew for different CA
This commit is contained in:
parent
947d14ffeb
commit
c4236e58d1
8
acme.sh
8
acme.sh
@ -529,6 +529,7 @@ _isEccKey() {
|
|||||||
_createkey() {
|
_createkey() {
|
||||||
length="$1"
|
length="$1"
|
||||||
f="$2"
|
f="$2"
|
||||||
|
_debug2 "_createkey for file:$f"
|
||||||
eccname="$length"
|
eccname="$length"
|
||||||
if _startswith "$length" "ec-"; then
|
if _startswith "$length" "ec-"; then
|
||||||
length=$(printf "%s" "$length" | cut -d '-' -f 2-100)
|
length=$(printf "%s" "$length" | cut -d '-' -f 2-100)
|
||||||
@ -1685,6 +1686,7 @@ _initpath() {
|
|||||||
if [ -z "$CA_CONF" ]; then
|
if [ -z "$CA_CONF" ]; then
|
||||||
CA_CONF="$_DEFAULT_CA_CONF"
|
CA_CONF="$_DEFAULT_CA_CONF"
|
||||||
fi
|
fi
|
||||||
|
_debug3 CA_CONF "$CA_CONF"
|
||||||
|
|
||||||
if [ -f "$CA_CONF" ]; then
|
if [ -f "$CA_CONF" ]; then
|
||||||
. "$CA_CONF"
|
. "$CA_CONF"
|
||||||
@ -2990,6 +2992,12 @@ renew() {
|
|||||||
|
|
||||||
if [ "$Le_API" ]; then
|
if [ "$Le_API" ]; then
|
||||||
API="$Le_API"
|
API="$Le_API"
|
||||||
|
#reload ca configs
|
||||||
|
ACCOUNT_KEY_PATH=""
|
||||||
|
ACCOUNT_JSON_PATH=""
|
||||||
|
CA_CONF=""
|
||||||
|
_debug3 "initpath again."
|
||||||
|
_initpath "$Le_Domain" "$_isEcc"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -z "$FORCE" ] && [ "$Le_NextRenewTime" ] && [ "$(_time)" -lt "$Le_NextRenewTime" ]; then
|
if [ -z "$FORCE" ] && [ "$Le_NextRenewTime" ] && [ "$(_time)" -lt "$Le_NextRenewTime" ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user