From 4a973aedf21670e381a31923382ca80dbc629576 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 7 Feb 2019 11:24:32 -0600 Subject: [PATCH] Update nodemgmt-scripts.sh --- nodemgmt-scripts.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 86e83472..f46a3ab6 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -27,7 +27,7 @@ STATUS() { if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) != *"${nip}"* ]]; then for rcheck in "${REPL_CHECK[@]}"; do ${NCMD} rm -f ${FOLDER}/test.repl - daterun=`date +%Y-%m-%d-%H-%M` + daterun=`date +%Y-%m-%d-%H-%M-%S` if [ "${NCMD}" = "" ]; then echo -e "iDS-Node${nid} (${nip})\n${daterun}" > ${FOLDER}/test.repl else @@ -137,7 +137,7 @@ STATUS-CHECK(){ if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) != *"${nip}"* ]]; then for rcheck in "${REPL_CHECK[@]}"; do ${NCMD} rm -f ${FOLDER}/test.repl - daterun=`date +%Y-%m-%d-%H-%M` + daterun=`date +%Y-%m-%d-%H-%M-%S` ${NCMD} echo -e "iDS-Node${nid} (${nip})\n${daterun}" > ${FOLDER}/test.repl ${NCMD} yes | cp -rfH ${FOLDER}/test.repl ${REPL_CHECKS[${rcheck}]}/test.repl done @@ -221,7 +221,7 @@ NEWCERT(){ do_with_root chown -R root:letsencrypt /etc/letsencrypt do_with_root chmod -R 6775 /etc/letsencrypt # rm -f ${FOLDER}/cert-request.lastrun - # daterun=`date +%Y-%m-%d-%H-%M` + # daterun=`date +%Y-%m-%d-%H-%M-%S` # echo -e "${NEW_CERT}\n${daterun}" > ${FOLDER}/cert-request.lastrun # yes | cp -rfH ${FOLDER}/cert-request.lastrun /etc/letsencrypt/cert-request.lastrun # DIVIDER true @@ -276,7 +276,7 @@ CERTRENEW(){ do_with_root chown -R root:letsencrypt /etc/letsencrypt 2>&1 | tee -a ${FOLDER}/cert-renewal.lastrun do_with_root chmod -R 6775 /etc/letsencrypt 2>&1 | tee -a ${FOLDER}/cert-renewal.lastrun yes | cp -rfH ${FOLDER}/cert-renewal.lastrun /etc/letsencrypt/cert-renewal.lastrun - daterun=`date +%Y-%m-%d-%H-%M` + daterun=`date +%Y-%m-%d-%H-%M-%S` echo -e "${daterun}" >> /etc/letsencrypt/cert-renewal.lastrun DIVIDER true echo -en "${idsCL[LightYellow]}Waiting for certificate replication between the nodes... ${idsCL[Default]}" @@ -320,7 +320,7 @@ NIGHTLYRENEW(){ do_with_root chown -R root:letsencrypt /etc/letsencrypt &>> ${FOLDER}/cert-renewal.lastrun do_with_root chmod -R 6775 /etc/letsencrypt &>> ${FOLDER}/cert-renewal.lastrun yes | cp -rfH ${FOLDER}/cert-renewal.lastrun /etc/letsencrypt/cert-renewal.lastrun - daterun=`date +%Y-%m-%d-%H-%M` + daterun=`date +%Y-%m-%d-%H-%M-%S` echo -e "${daterun}" >> /etc/letsencrypt/cert-renewal.lastrun checked=false timeout=`date --date='2 minutes' +%s` @@ -744,11 +744,11 @@ NEWSITE(){ fi rm -f ${FOLDER}/new-site.lastrun - daterun=`date +%Y-%m-%d-%H-%M` + daterun=`date +%Y-%m-%d-%H-%M-%S` echo -e "${NEW_SITE}\n${daterun}" > ${FOLDER}/new-site.lastrun yes | cp -rfH ${FOLDER}/new-site.lastrun /etc/nginx/new-site.lastrun yes | cp -rfH ${FOLDER}/new-site.lastrun /var/www/new-site.lastrun - daterun=`date +%Y-%m-%d-%H-%M` + daterun=`date +%Y-%m-%d-%H-%M-%S` echo -e "${daterun}" >> /etc/nginx/new-site.lastrun DIVIDER true echo -en "${idsCL[LightYellow]}Waiting for certificate replication between the nodes... ${idsCL[Default]}"