diff --git a/defaults.inc b/defaults.inc index 19530ccc..acd1f090 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.15.7-11222023' +VERS='4.15.8-11222023' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update ' CERT_DAEMON='/snap/bin/certbot' diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index c8c5e86c..8deaa972 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # NodeMgmt - Node Management Scripts -action="$1" +ACTION="${1}" source /opt/idssys/defaults/colors.inc source /opt/idssys/defaults/default.inc @@ -46,7 +46,7 @@ BACKUP(){ echo DIVIDER echo -e "${idsCL[Green]}Backups are completed\n\n" - if [ -z $action ] || [ "${action}" = "gui" ]; then + if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then ENTER2CONTINUE fi } @@ -188,7 +188,7 @@ SET-PERMISSIONS(){ nid=`expr $nid + 1` done if [ "${NEW_SITE}" != "" ]; then echo ; fi - if [ -z $action ] || [ "${action}" = "gui" ]; then + if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then ENTER2CONTINUE fi fi @@ -442,8 +442,7 @@ export PDNS_Ttl=60 ssh -q root@${NM_VC_HOSTNAME} "${NM_VC_ACMEFOLDER}/${NM_VC_ACMESCRIPT} --upgrade" echo -e "\n${idsCL[LightGreen]}Renewing certificate ...${idsCL[Default]}\n" if [ "${1}" == "force" ]; then - # echo "${NM_VC_ACMEFOLDER}/${NM_VC_ACMESCRIPT} --renew-all --force" >> /tmp/vcenter-update-ssl.sh - echo "echo 'SCRIPT RUNNING OOOOOOOOOOO'" >> /tmp/vcenter-update-ssl.sh + echo "${NM_VC_ACMEFOLDER}/${NM_VC_ACMESCRIPT} --renew-all --force" >> /tmp/vcenter-update-ssl.sh else echo "${NM_VC_ACMEFOLDER}/${NM_VC_ACMESCRIPT} --renew-all" >> /tmp/vcenter-update-ssl.sh fi @@ -491,7 +490,7 @@ ADD_LOGROTATE_CRONTAB(){ UPDATE_DYNDNS(){ TESTMODE=0; FORCE=0; while [ $# -gt 0 ]; do - case "$1" in + case "${1}" in -f|-force) FORCE=1;; -t|-test) TESTMODE=1;; -h | -help | --help) @@ -684,7 +683,7 @@ DOWNLIST(){ read -rd '' -a DOWNLIST <<<"${DOWN_LIST}" unset IFS - if [ -z $action ] || [ "${action}" = "gui" ]; then + if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then DIVIDER true fi echo @@ -793,7 +792,7 @@ DOWNLIST(){ echo fi - if [ -z $action ] || [ "${action}" = "gui" ]; then + if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then DIVIDER true ENTER2CONTINUE fi @@ -851,7 +850,7 @@ GUI(){ if [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]] && [[ "${noheader}" != *" ${3} "* ]] && [ "${2}" != "q" ] && [ "${3}" != "q" ]; then DISP_HEADER fi - case $action in + case ${ACTION} in newcert) NEWCERT ${2} ${3};; certrenew) CERTRENEW;; delcert) DEL-SSL ${2};; @@ -975,7 +974,16 @@ GUI(){ singleservercheck) SINGLE_SERVER_SERVICE_CHECK ${2} ${3} ${4} ${5} ${6};; haproxy-config) HAPROXY-CONFIG;; keepalive-config) KEEPALIVE-CONFIG;; - vc-ssl) VCENTER-SSL ${2};; + vc-ssl) + if [ "${2,,}" == "q" ] || [ "${3,,}" == "q" ]; then + echo "$(date) - vCenter Update Initiated" >> ${NM_LOGFOLDER}/vc-ssl.log + VCENTER-SSL ${2} >> ${NM_LOGFOLDER}/vc-ssl.log + echo "$(date) - vCenter Update Completed +" >> ${NM_LOGFOLDER}/vc-ssl.log + else + VCENTER-SSL ${2} + fi + ;; run) RUN_COMMAND ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14} ${15};; backup-offsitepfsense) BACKUP_OFFSITEPFSENSE;;