plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-10-31 19:41:45 +00:00
Code Issues Projects Releases Wiki Activity

fix https://github.com/acmesh-official/acme.sh/issues/3103

Browse Source
This commit is contained in:
neil 2020-08-15 12:32:15 +08:00
parent b3a801df11
commit 95ef046d0a
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
acme.sh
View File

@ -5228,13 +5228,17 @@ showcsr() {
_info "KeyLength=$_csrkeylength"
}
#listraw domain
list() {
_raw="$1"
_domain="$2"
_initpath
_sep="|"
if [ "$_raw" ]; then
printf "%s\n" "Main_Domain${_sep}KeyLength${_sep}SAN_Domains${_sep}CA${_sep}Created${_sep}Renew"
if [ -z "$_domain" ]; then
printf "%s\n" "Main_Domain${_sep}KeyLength${_sep}SAN_Domains${_sep}CA${_sep}Created${_sep}Renew"
fi
for di in "${CERT_HOME}"/*.*/; do
d=$(basename "$di")
_debug d "$d"
@ -5247,15 +5251,21 @@ list() {
if [ -f "$DOMAIN_CONF" ]; then
. "$DOMAIN_CONF"
_ca="$(_getCAShortName "$Le_API")"
printf "%s\n" "$Le_Domain${_sep}\"$Le_Keylength\"${_sep}$Le_Alt${_sep}$_ca${_sep}$Le_CertCreateTimeStr${_sep}$Le_NextRenewTimeStr"
if [ -z "$_domain" ]; then
printf "%s\n" "$Le_Domain${_sep}\"$Le_Keylength\"${_sep}$Le_Alt${_sep}$_ca${_sep}$Le_CertCreateTimeStr${_sep}$Le_NextRenewTimeStr"
else
if [ "$_domain" = "$d" ]; then
cat "$DOMAIN_CONF"
fi
fi
fi
)
done
else
if _exists column; then
list "raw" | column -t -s "$_sep"
list "raw" "$_domain" | column -t -s "$_sep"
else
list "raw" | tr "$_sep" '\t'
list "raw" "$_domain" | tr "$_sep" '\t'
fi
fi
@ -6595,6 +6605,9 @@ _selectServer() {
#url
_getCAShortName() {
caurl="$1"
if [ -z "$caurl" ]; then
caurl="$DEFAULT_CA"
fi
caurl_lower="$(echo $caurl | _lower_case)"
_sindex=0
for surl in $(echo "$CA_SERVERS" | _lower_case | tr , ' '); do
@ -7271,7 +7284,7 @@ _process() {
deactivateaccount
;;
list)
list "$_listraw"
list "$_listraw" "$_domain"
;;
installcronjob) installcronjob "$_confighome" ;;
uninstallcronjob) uninstallcronjob ;;