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
c4236e58
Commit
c4236e58
authored
Dec 10, 2016
by
neilpang
Browse files
fix renew for different CA
parent
947d14ff
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
c4236e58
...
@@ -529,6 +529,7 @@ _isEccKey() {
...
@@ -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() {
...
@@ -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() {
...
@@ -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
...
...
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