Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
5c48e139
Commit
5c48e139
authored
Sep 27, 2016
by
neil
Browse files
support individual ca accounts
parent
b19ba13a
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
5c48e139
...
@@ -848,6 +848,7 @@ _mktemp() {
...
@@ -848,6 +848,7 @@ _mktemp() {
if
mktemp
2>/dev/null
;
then
if
mktemp
2>/dev/null
;
then
return
return
elif
_contains
"
$(
mktemp
2>&1
)
"
"-t prefix"
&&
mktemp
-t
"
$PROJECT_NAME
"
2>/dev/null
;
then
elif
_contains
"
$(
mktemp
2>&1
)
"
"-t prefix"
&&
mktemp
-t
"
$PROJECT_NAME
"
2>/dev/null
;
then
#for Mac osx
return
return
fi
fi
fi
fi
...
@@ -1345,6 +1346,8 @@ __initHome() {
...
@@ -1345,6 +1346,8 @@ __initHome() {
fi
fi
DEFAULT_LOG_FILE
=
"
$LE_WORKING_DIR
/
$PROJECT_NAME
.log"
DEFAULT_LOG_FILE
=
"
$LE_WORKING_DIR
/
$PROJECT_NAME
.log"
DEFAULT_CA_HOME
=
"
$LE_WORKING_DIR
/ca"
}
}
#[domain] [keylength]
#[domain] [keylength]
...
@@ -1362,6 +1365,10 @@ _initpath() {
...
@@ -1362,6 +1365,10 @@ _initpath() {
export
PATH
=
"
$USER_PATH
:
$PATH
"
export
PATH
=
"
$USER_PATH
:
$PATH
"
fi
fi
fi
fi
if
[
-z
"
$CA_HOME
"
]
;
then
CA_HOME
=
"
$DEFAULT_CA_HOME
"
fi
if
[
-z
"
$API
"
]
;
then
if
[
-z
"
$API
"
]
;
then
if
[
-z
"
$STAGE
"
]
;
then
if
[
-z
"
$STAGE
"
]
;
then
...
@@ -1372,6 +1379,19 @@ _initpath() {
...
@@ -1372,6 +1379,19 @@ _initpath() {
fi
fi
fi
fi
_API_HOST
=
"
$(
echo
"
$API
"
|
cut
-d
:
-f
2 |
tr
-d
'/'
)
"
CA_DIR
=
"
$CA_HOME
/
$_API_HOST
"
_DEFAULT_CA_CONF
=
"
$CA_DIR
/ca.conf"
if
[
-z
"
$CA_CONF
"
]
;
then
CA_CONF
=
"
$_DEFAULT_CA_CONF
"
fi
if
[
-f
"
$CA_CONF
"
]
;
then
.
"
$CA_CONF
"
fi
if
[
-z
"
$ACME_DIR
"
]
;
then
if
[
-z
"
$ACME_DIR
"
]
;
then
ACME_DIR
=
"/home/.acme"
ACME_DIR
=
"/home/.acme"
fi
fi
...
@@ -1388,11 +1408,20 @@ _initpath() {
...
@@ -1388,11 +1408,20 @@ _initpath() {
HTTP_HEADER
=
"
$LE_WORKING_DIR
/http.header"
HTTP_HEADER
=
"
$LE_WORKING_DIR
/http.header"
fi
fi
_DEFAULT_ACCOUNT_KEY_PATH
=
"
$LE_WORKING_DIR
/account.key"
_OLD_ACCOUNT_KEY
=
"
$LE_WORKING_DIR
/account.key"
_OLD_ACCOUNT_JSON
=
"
$LE_WORKING_DIR
/account.json"
_DEFAULT_ACCOUNT_KEY_PATH
=
"
$CA_DIR
/account.key"
_DEFAULT_ACCOUNT_JSON_PATH
=
"
$CA_DIR
/account.json"
if
[
-z
"
$ACCOUNT_KEY_PATH
"
]
;
then
if
[
-z
"
$ACCOUNT_KEY_PATH
"
]
;
then
ACCOUNT_KEY_PATH
=
"
$_DEFAULT_ACCOUNT_KEY_PATH
"
ACCOUNT_KEY_PATH
=
"
$_DEFAULT_ACCOUNT_KEY_PATH
"
fi
fi
if
[
-z
"
$ACCOUNT_JSON_PATH
"
]
;
then
ACCOUNT_JSON_PATH
=
"
$_DEFAULT_ACCOUNT_JSON_PATH
"
fi
_DEFAULT_CERT_HOME
=
"
$LE_WORKING_DIR
"
_DEFAULT_CERT_HOME
=
"
$LE_WORKING_DIR
"
if
[
-z
"
$CERT_HOME
"
]
;
then
if
[
-z
"
$CERT_HOME
"
]
;
then
CERT_HOME
=
"
$_DEFAULT_CERT_HOME
"
CERT_HOME
=
"
$_DEFAULT_CERT_HOME
"
...
@@ -1401,6 +1430,9 @@ _initpath() {
...
@@ -1401,6 +1430,9 @@ _initpath() {
if
[
-z
"
$1
"
]
;
then
if
[
-z
"
$1
"
]
;
then
return
0
return
0
fi
fi
mkdir
-p
"
$CA_DIR
"
domain
=
"
$1
"
domain
=
"
$1
"
_ilength
=
"
$2
"
_ilength
=
"
$2
"
...
@@ -1793,6 +1825,17 @@ registeraccount() {
...
@@ -1793,6 +1825,17 @@ registeraccount() {
_regAccount
()
{
_regAccount
()
{
_initpath
_initpath
if
[
!
-f
"
$ACCOUNT_KEY_PATH
"
]
&&
[
-f
"
$_OLD_ACCOUNT_KEY
"
]
;
then
_info
"mv
$_OLD_ACCOUNT_KEY
to
$ACCOUNT_KEY_PATH
"
mv
"
$_OLD_ACCOUNT_KEY
"
"
$ACCOUNT_KEY_PATH
"
fi
if
[
!
-f
"
$ACCOUNT_JSON_PATH
"
]
&&
[
-f
"
$_OLD_ACCOUNT_JSON
"
]
;
then
_info
"mv
$_OLD_ACCOUNT_JSON
to
$ACCOUNT_JSON_PATH
"
mv
"
$_OLD_ACCOUNT_JSON
"
"
$ACCOUNT_JSON_PATH
"
fi
if
[
!
-f
"
$ACCOUNT_KEY_PATH
"
]
;
then
if
[
!
-f
"
$ACCOUNT_KEY_PATH
"
]
;
then
_acck
=
"no"
_acck
=
"no"
if
[
"
$Le_Keylength
"
]
;
then
if
[
"
$Le_Keylength
"
]
;
then
...
@@ -1831,7 +1874,7 @@ _regAccount() {
...
@@ -1831,7 +1874,7 @@ _regAccount() {
fi
fi
if
[
"
$code
"
=
""
]
||
[
"
$code
"
=
'201'
]
;
then
if
[
"
$code
"
=
""
]
||
[
"
$code
"
=
'201'
]
;
then
echo
"
$response
"
>
$
LE_WORKING_DIR
/account.json
echo
"
$response
"
>
$
ACCOUNT_JSON_PATH
_info
"Registered"
_info
"Registered"
elif
[
"
$code
"
=
'409'
]
;
then
elif
[
"
$code
"
=
'409'
]
;
then
_info
"Already registered"
_info
"Already registered"
...
@@ -2447,6 +2490,9 @@ issue() {
...
@@ -2447,6 +2490,9 @@ issue() {
Le_NextRenewTime
=
$(
_math
$Le_NextRenewTime
- 86400
)
Le_NextRenewTime
=
$(
_math
$Le_NextRenewTime
- 86400
)
_savedomainconf
"Le_NextRenewTime"
"
$Le_NextRenewTime
"
_savedomainconf
"Le_NextRenewTime"
"
$Le_NextRenewTime
"
Le_API
=
"
$API
"
_savedomainconf
"Le_API"
"
$Le_API
"
_on_issue_success
_on_issue_success
if
[
"
$Le_RealCertPath$Le_RealKeyPath$Le_RealCACertPath$Le_ReloadCmd$Le_RealFullChainPath
"
]
;
then
if
[
"
$Le_RealCertPath$Le_RealKeyPath$Le_RealCACertPath$Le_ReloadCmd$Le_RealFullChainPath
"
]
;
then
...
@@ -2478,6 +2524,11 @@ renew() {
...
@@ -2478,6 +2524,11 @@ renew() {
fi
fi
.
"
$DOMAIN_CONF
"
.
"
$DOMAIN_CONF
"
if
[
"
$Le_API
"
]
;
then
API
=
"
$Le_API
"
fi
if
[
-z
"
$FORCE
"
]
&&
[
"
$Le_NextRenewTime
"
]
&&
[
"
$(
_time
)
"
-lt
"
$Le_NextRenewTime
"
]
;
then
if
[
-z
"
$FORCE
"
]
&&
[
"
$Le_NextRenewTime
"
]
&&
[
"
$(
_time
)
"
-lt
"
$Le_NextRenewTime
"
]
;
then
_info
"Skip, Next renewal time is:
$(
__green
"
$Le_NextRenewTimeStr
"
)
"
_info
"Skip, Next renewal time is:
$(
__green
"
$Le_NextRenewTimeStr
"
)
"
_info
"Add '
$(
__red
'--force'
)
' to force to renew."
_info
"Add '
$(
__red
'--force'
)
' to force to renew."
...
...
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