From ee204cd94e3af9de6a94ec7b2ddd0e3ed6691a0d Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 12 Nov 2023 10:40:04 -0600 Subject: [PATCH] Update sites.inc --- inc/sites.inc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/inc/sites.inc b/inc/sites.inc index 6126dc5d..c95acd7a 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -692,7 +692,8 @@ SITEINFO(){ else ssl='Yes' certpath=$(grep ssl_certificate_key ${sitefile}) - certpath=${certpath%/*}; certpath=${certpath#* } + certpath=${certpath%/*} + certpath=${certpath#* } SUBJECTNAMES=$(openssl x509 -in ${certpath}/cert.pem -noout -text|grep -oP '(?<=DNS:|IP Address:)[^,]+'|sort -uV) CERTEXPIRE=$(date -d "$(: | openssl x509 -in ${certpath}/cert.pem -text | grep 'Not After' |awk '{print $4,$5,$7}')" '+%s'); SUBJECTNAMES=${SUBJECTNAMES//$'\n'/, } @@ -803,10 +804,12 @@ SITEINFO(){ exit 0 ;; [Cc]) - echo -e "\n\033[K\033[6A"; - echo -e "\033[K\n\033[K\n\033[K\n\033[K\n\033[K\n\033[K"; - echo -e "\033[6A" - + # echo -e "\n\033[K\033[6A"; + # echo -e "\033[K\n\033[K\n\033[K\n\033[K\n\033[K\n\033[K"; + # echo -e "\033[6A" + echo -e "\n\033[K\n\033[K" + SITEINFO ${1} ${2} + exit 0 # break 3 ;; *) ;;