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
269847d1
You need to sign in or sign up before continuing.
Commit
269847d1
authored
Aug 12, 2020
by
neil
Browse files
Add CA name to the `--list` command output.
parent
df22f680
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
269847d1
...
@@ -37,11 +37,11 @@ DEFAULT_CA=$CA_LETSENCRYPT_V2
...
@@ -37,11 +37,11 @@ DEFAULT_CA=$CA_LETSENCRYPT_V2
DEFAULT_STAGING_CA=$CA_LETSENCRYPT_V2_TEST
DEFAULT_STAGING_CA=$CA_LETSENCRYPT_V2_TEST
CA_NAMES="
CA_NAMES="
letsencrypt
Letsencrypt.org,
letsencrypt
letsencrypt_test,letsencrypttest
Letsencrypt.org_test,
letsencrypt_test,letsencrypttest
buypass
BuyPass.com,
buypass
buypass_test,buypasstest
BuyPass.com_test,
buypass_test,buypasstest
zerossl
ZeroSSL.com,
zerossl
"
"
CA_SERVERS="$CA_LETSENCRYPT_V2,$CA_LETSENCRYPT_V2_TEST,$CA_BUYPASS,$CA_BUYPASS_TEST,$CA_ZEROSSL"
CA_SERVERS="$CA_LETSENCRYPT_V2,$CA_LETSENCRYPT_V2_TEST,$CA_BUYPASS,$CA_BUYPASS_TEST,$CA_ZEROSSL"
...
@@ -5254,7 +5254,7 @@ list() {
...
@@ -5254,7 +5254,7 @@ list() {
_sep="|"
_sep="|"
if [ "$_raw" ]; then
if [ "$_raw" ]; then
printf "%s\n" "Main_Domain${_sep}KeyLength${_sep}SAN_Domains${_sep}Created${_sep}Renew"
printf "%s\n" "Main_Domain${_sep}KeyLength${_sep}SAN_Domains${_sep}
CA${_sep}
Created${_sep}Renew"
for di in "${CERT_HOME}"/*.*/; do
for di in "${CERT_HOME}"/*.*/; do
d=$(basename "$di")
d=$(basename "$di")
_debug d "$d"
_debug d "$d"
...
@@ -5266,7 +5266,8 @@ list() {
...
@@ -5266,7 +5266,8 @@ list() {
DOMAIN_CONF="$di/$d.conf"
DOMAIN_CONF="$di/$d.conf"
if [ -f "$DOMAIN_CONF" ]; then
if [ -f "$DOMAIN_CONF" ]; then
. "$DOMAIN_CONF"
. "$DOMAIN_CONF"
printf "%s\n" "$Le_Domain${_sep}\"$Le_Keylength\"${_sep}$Le_Alt${_sep}$Le_CertCreateTimeStr${_sep}$Le_NextRenewTimeStr"
_ca="$(_getCAShortName "$Le_API")"
printf "%s\n" "$Le_Domain${_sep}\"$Le_Keylength\"${_sep}$Le_Alt${_sep}$_ca${_sep}$Le_CertCreateTimeStr${_sep}$Le_NextRenewTimeStr"
fi
fi
)
)
done
done
...
@@ -6611,6 +6612,27 @@ _selectServer() {
...
@@ -6611,6 +6612,27 @@ _selectServer() {
export ACME_DIRECTORY
export ACME_DIRECTORY
}
}
#url
_getCAShortName() {
caurl="$1"
caurl_lower="$(echo $caurl | _lower_case)"
_sindex=0
for surl in $(echo "$CA_SERVERS" | _lower_case | tr , ' '); do
_sindex="$(_math $_sindex + 1)"
if [ "$caurl_lower" = "$surl" ]; then
_nindex=0
for snames in $CA_NAMES; do
_nindex="$(_math $_nindex + 1)"
if [ $_nindex -ge $_sindex ]; then
_getfield "$snames" 1
return
fi
done
fi
done
echo "$caurl"
}
#set default ca to $ACME_DIRECTORY
#set default ca to $ACME_DIRECTORY
setdefaultca() {
setdefaultca() {
if [ -z "$ACME_DIRECTORY" ]; then
if [ -z "$ACME_DIRECTORY" ]; 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