voltron/NodeMgmt
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

update

Browse Source
This commit is contained in:
David Schroeder
2019-02-11 12:40:49 -06:00
parent 8e8cfe9429
commit 27c3abb7c2
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
defaults.inc
View File

@@ -58,7 +58,17 @@ REPL_DESC['www']='Webserver Files'
REPL_DESC['git']='Gitea System' REPL_DESC['git']='Gitea System'
REPL_DESC['gitssh']='Gitea SSH Keys' REPL_DESC['gitssh']='Gitea SSH Keys'
GET-CHECKCERT-DOMAINS(){
declare -A CHECKCERT_DOMAINS
IFS=$'\n'
for LINE in `egrep -v '(^#|^$)' ${FOLDER}/ssl-cert-check/ssldomains`; do
HOST=${LINE%% *}
PORT=${LINE#* }
IFS=" "
CHECKCERT_DOMAINS[${HOST}]=${PORT}
done
unset IFS
}
DISP_HEADER(){ DISP_HEADER(){
declare -i cw; declare -i spc1; declare -i c declare -i cw; declare -i spc1; declare -i c

6
nodemgmt-scripts.sh
View File

@@ -579,6 +579,7 @@ NIGHTLYRENEW(){
LISTCERTS(){ LISTCERTS(){
declare -i cw; declare -i spc1; declare -i c declare -i cw; declare -i spc1; declare -i c
GET-CHECKCERT-DOMAINS
if [ ! -z ${LOCAL_SERVICES+x} ]; then if [ ! -z ${LOCAL_SERVICES+x} ]; then
NCMD="ssh root@${PRIMARYHOST}" NCMD="ssh root@${PRIMARYHOST}"
${NCMD} rm -f /tmp/ssllist ${NCMD} rm -f /tmp/ssllist
@@ -617,6 +618,11 @@ LISTCERTS(){
else else
date="${idsCL[Green]}$(date -d @${CERTEXPIRE} '+%m-%d-%Y')${idsCL[Default]}" date="${idsCL[Green]}$(date -d @${CERTEXPIRE} '+%m-%d-%Y')${idsCL[Default]}"
fi fi
if [ "${GET-CHECKCERT-DOMAINS[${SUBJECT}]}" = "" ]; then
SUBJECT_DISP=${SUBJECT}
else
SUBJECT_DISP="${idsCL[Green]}${SUBJECT}${idsCL[Cyan]}"
fi
if [ ${#SUBJECT_NAMES[@]} -lt 4 ]; then if [ ${#SUBJECT_NAMES[@]} -lt 4 ]; then
echo -e "${idsCL[Cyan]}${SUBJECT}${spc}${date} ${idsCL[Cyan]}${SUBJECTNAMES}${idsCL[Default]}" echo -e "${idsCL[Cyan]}${SUBJECT}${spc}${date} ${idsCL[Cyan]}${SUBJECTNAMES}${idsCL[Default]}"
elif [ ${#SUBJECT_NAMES[@]} -lt 7 ]; then elif [ ${#SUBJECT_NAMES[@]} -lt 7 ]; then