Commit 95ef046d authored by neil's avatar neil
Browse files
parent b3a801df
...@@ -5228,13 +5228,17 @@ showcsr() { ...@@ -5228,13 +5228,17 @@ showcsr() {
_info "KeyLength=$_csrkeylength" _info "KeyLength=$_csrkeylength"
} }
#listraw domain
list() { list() {
_raw="$1" _raw="$1"
_domain="$2"
_initpath _initpath
_sep="|" _sep="|"
if [ "$_raw" ]; then 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 for di in "${CERT_HOME}"/*.*/; do
d=$(basename "$di") d=$(basename "$di")
_debug d "$d" _debug d "$d"
...@@ -5247,15 +5251,21 @@ list() { ...@@ -5247,15 +5251,21 @@ list() {
if [ -f "$DOMAIN_CONF" ]; then if [ -f "$DOMAIN_CONF" ]; then
. "$DOMAIN_CONF" . "$DOMAIN_CONF"
_ca="$(_getCAShortName "$Le_API")" _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 fi
) )
done done
else else
if _exists column; then if _exists column; then
list "raw" | column -t -s "$_sep" list "raw" "$_domain" | column -t -s "$_sep"
else else
list "raw" | tr "$_sep" '\t' list "raw" "$_domain" | tr "$_sep" '\t'
fi fi
fi fi
...@@ -6595,6 +6605,9 @@ _selectServer() { ...@@ -6595,6 +6605,9 @@ _selectServer() {
#url #url
_getCAShortName() { _getCAShortName() {
caurl="$1" caurl="$1"
if [ -z "$caurl" ]; then
caurl="$DEFAULT_CA"
fi
caurl_lower="$(echo $caurl | _lower_case)" caurl_lower="$(echo $caurl | _lower_case)"
_sindex=0 _sindex=0
for surl in $(echo "$CA_SERVERS" | _lower_case | tr , ' '); do for surl in $(echo "$CA_SERVERS" | _lower_case | tr , ' '); do
...@@ -7271,7 +7284,7 @@ _process() { ...@@ -7271,7 +7284,7 @@ _process() {
deactivateaccount deactivateaccount
;; ;;
list) list)
list "$_listraw" list "$_listraw" "$_domain"
;; ;;
installcronjob) installcronjob "$_confighome" ;; installcronjob) installcronjob "$_confighome" ;;
uninstallcronjob) uninstallcronjob ;; uninstallcronjob) uninstallcronjob ;;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment