From ef5940e53be6aea811d316e565bd5556aa173419 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Fri, 26 Jan 2024 14:45:55 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- inc/certs.inc | 24 +++++++++---------- inc/services.inc | 22 +++++++++--------- inc/sites.inc | 30 ++++++++++++------------ inc/status.inc | 26 ++++++++++----------- nodemgmt-scripts.sh | 56 ++++++++++++++++++++++----------------------- 6 files changed, 80 insertions(+), 80 deletions(-) diff --git a/defaults.inc b/defaults.inc index 77b201b1..0c853c42 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='5.1.81-01262024' +VERS='5.1.82-01262024' NM_BETA=false noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log betacheck ' diff --git a/inc/certs.inc b/inc/certs.inc index 0f4fac90..3f93b3c5 100755 --- a/inc/certs.inc +++ b/inc/certs.inc @@ -216,7 +216,7 @@ LISTCERTS(){ fi # if [ ! -z ${LOCAL_SERVICES+x} ]; then - # NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_HOSTS['LB'][0]}" + # NCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_HOSTS['LB'][0]}" # #${NCMD} rm -f /tmp/ssllist # #${NCMD} 'for certdir in ${NM_CERTPATH}/live/*/ ; do echo $certdir; done' > /tmp/ssllist # else @@ -479,7 +479,7 @@ LISTCERTS_NPM(){ done unset IFS if [ ! -z ${LOCAL_SERVICES+x} ]; then - NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${MYSQL_HOSTS[0]}" + NCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${MYSQL_HOSTS[0]}" ${NCMD} rm -f /tmp/ssllist ${NCMD} 'for certdir in ${NM_CERTPATH}/live/*/ ; do echo $certdir; done' > /tmp/ssllist else @@ -675,17 +675,17 @@ export PDNS_Token='${NM_PDNS_APIKEY}' export PDNS_Ttl=60 " >> /tmp/vcenter-update-ssl.sh - if ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} [ ! -d ${NM_VC_ACMEFOLDER} ]; then + if ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} [ ! -d ${NM_VC_ACMEFOLDER} ]; then echo -e "${idsCL[Yellow]}Installing acme.sh scripts onto vCenter ... ${idsCL[Default]}\n" until [ "${le_email}" != "" ]; do echo -en "${idsCL[LightCyan]}Enter your email to register with LetsEncrypt: ${idsCL[Default]}" read le_email echo done - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} "wget -O - https://get.acme.sh | sh -s email=${le_email}" + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} "wget -O - https://get.acme.sh | sh -s email=${le_email}" else echo -e "${idsCL[Green]}Verified acme.sh scripts are installed on vCenter, checking for updates ... ${idsCL[Default]}\n" - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} "${NM_VC_ACMEFOLDER}/${NM_VC_ACMESCRIPT} --upgrade" + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} "${NM_VC_ACMEFOLDER}/${NM_VC_ACMESCRIPT} --upgrade" fi if [ ! -d ${NM_VC_ACMEFOLDER}/${NM_VC_HOSTNAME} ];then @@ -701,10 +701,10 @@ export PDNS_Ttl=60 fi fi - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} 'sed -i "/PDNS_Token/d" /root/.acme.sh/account.conf' - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} 'sed -i "/PDNS_Url/d" /root/.acme.sh/account.conf' + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} 'sed -i "/PDNS_Token/d" /root/.acme.sh/account.conf' + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} 'sed -i "/PDNS_Url/d" /root/.acme.sh/account.conf' scp -q /tmp/vcenter-update-ssl.sh root@${NM_VC_HOSTNAME}:/tmp/vcenter-update-ssl.sh - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} "bash /tmp/vcenter-update-ssl.sh" + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} "bash /tmp/vcenter-update-ssl.sh" if [ ! -f ${NM_VC_ACMEFOLDER}/${NM_VC_HOSTNAME}/${NM_VC_HOSTNAME}.cer ]; then echo -e "${idsCL[LightYellow]}No certificate was created${idsCL[Default]}\n" @@ -713,8 +713,8 @@ export PDNS_Ttl=60 echo -e "${idsCL[LightYellow]}The certificate was unable to be updated${idsCL[Default]}\n" exit 0 else - LIVEMD5=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} "md5sum /etc/vmware-rhttpproxy/ssl/rui.crt | cut -d\ -f1") - CURRENTMD5=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} "md5sum ${VC_CERT} | cut -d\ -f1") + LIVEMD5=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} "md5sum /etc/vmware-rhttpproxy/ssl/rui.crt | cut -d\ -f1") + CURRENTMD5=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} "md5sum ${VC_CERT} | cut -d\ -f1") if [ "$LIVEMD5" == "$CURRENTMD5" ] && [ "${1}" != "force" ]; then echo -e "${idsCL[LightYellow]}Certificates remains the same, no newer certificates exist${idsCL[Default]}\n" exit 0 @@ -725,12 +725,12 @@ export PDNS_Ttl=60 echo -e "${idsCL[LightCyan]}This process make take up to 10mins${idsCL[Default]}" echo - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} "(printf '1\n%s\n' '${NM_VC_USER}'; sleep 1; printf '%s\n' '${NM_VC_PASS}'; sleep 1; printf '2\n'; sleep 1; printf '%s\n%s\n%s\ny\n\n' '${VC_CERT}' '${VC_KEY}' '${VC_CHAIN}') | setsid /usr/lib/vmware-vmca/bin/certificate-manager" + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} "(printf '1\n%s\n' '${NM_VC_USER}'; sleep 1; printf '%s\n' '${NM_VC_PASS}'; sleep 1; printf '2\n'; sleep 1; printf '%s\n%s\n%s\ny\n\n' '${VC_CERT}' '${VC_KEY}' '${VC_CHAIN}') | setsid /usr/lib/vmware-vmca/bin/certificate-manager" SENDNOTICE "vCenter SSL Updated" "Refresh/Reconnect any systems connecting to vCenter, like Veeam Dummy!" echo "$(date +%Y-%m-%d-%H-%M-%S) VCENTER SSL HAS BEEN UPDATED" >> ${NM_LOGFOLDER}/vc-ssl.log - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} "rm -f /tmp/vcenter-update-ssl.sh" + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_VC_HOSTNAME} "rm -f /tmp/vcenter-update-ssl.sh" rm -f /tmp/vcenter-update-ssl.sh echo -e "\n${idsCL[Green]}The vCenter certifcate has been updated${idsCL[Default]}" diff --git a/inc/services.inc b/inc/services.inc index 29763b32..ffbf025b 100755 --- a/inc/services.inc +++ b/inc/services.inc @@ -29,8 +29,8 @@ SINGLE_SERVER_SERVICE_CHECK(){ [ "${stc}" = "pdnsadmin" ] && stc="pdnsadmin.service pdnsadmin.socket" for nip in "${!hosts}"; do if [[ "${RUN_NODE_IP}" != *"${nip}"* ]] && [ "$(CHECK_HOST ${nip})" != "false" ]; then - ssh -tq -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} /bin/systemctl stop ${stc} - ssh -tq -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} rm -f ${NM_TMPFOLDER}/.singleserver + ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} /bin/systemctl stop ${stc} + ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} rm -f ${NM_TMPFOLDER}/.singleserver fi done sleep 3s @@ -54,8 +54,8 @@ SINGLE_SERVER_SERVICE_CHECK(){ else if [ "$(CHECK_HOST ${nip})" != "false" ]; then - [ "$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} /usr/bin/docker ps -q -f name=${docker})" ] && ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} /usr/bin/docker stop ${docker} >/dev/null 2>&1 - [ "${docker}" == "authelia" ] && [ "$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} /usr/bin/docker ps -q -f name=auth_redis)" ] && ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} /usr/bin/docker stop auth_redis >/dev/null 2>&1 + [ "$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} /usr/bin/docker ps -q -f name=${docker})" ] && ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} /usr/bin/docker stop ${docker} >/dev/null 2>&1 + [ "${docker}" == "authelia" ] && [ "$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} /usr/bin/docker ps -q -f name=auth_redis)" ] && ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} /usr/bin/docker stop auth_redis >/dev/null 2>&1 fi fi done @@ -163,7 +163,7 @@ SERVICE_MGMT(){ nip='localhost ' NCMD='' else - NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}" + NCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip}" fi [ ${QUIET} -eq 0 ] && echo -en "${NM_SRVCOPTS[${SERVICE['action']}]}ing on '$nip'... ${idsCL[Default]}" @@ -197,7 +197,7 @@ SERVICE_MGMT(){ nip='localhost ' NCMD='' else - NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}" + NCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip}" fi if [ ${QUIET} -eq 0 ]; then @@ -278,7 +278,7 @@ SERVICE_MGMT(){ if [[ "${RUN_NODE_IP}" == *"${!NT_HOST}"* ]]; then PH_CMD="" else - PH_CMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${!NT_HOST}" + PH_CMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${!NT_HOST}" fi ${PH_CMD} touch ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl # ${PH_CMD} "echo -e \"Service ${SERVICE['service']} ${SERVICE['action']}\" >> ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl" @@ -287,7 +287,7 @@ SERVICE_MGMT(){ if [ "${checkhost}" != "false" ] && [ "${nip}" != "${!NT_HOST}" ]; then checked=false until [ "${checked}" = "true" ]; do - checked="`${PH_CMD} ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} [ -f ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl ] && [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl)) -le 90 ] && echo true`" + checked="`${PH_CMD} ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} [ -f ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl ] && [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl)) -le 90 ] && echo true`" done fi done @@ -301,7 +301,7 @@ SERVICE_MGMT(){ if [[ "${RUN_NODE_IP}" == *"${!NT_HOST}"* ]]; then PH_CMD="" else - PH_CMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${!NT_HOST}" + PH_CMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${!NT_HOST}" fi ${PH_CMD} touch ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl for nip in "${!NT_HOSTS}"; do @@ -353,7 +353,7 @@ SERVICE_MGMT(){ nip='localhost ' NCMD='' else - NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}" + NCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip}" fi NOGOCHK=true; @@ -376,7 +376,7 @@ SERVICE_MGMT(){ if [ "${SERVICE['service']}"= = "offsite-power-check" ]; then if [ ${QUIET} -eq 0 ] && [ "${SERVICE['action']}" != "status" ]; then - if [ "$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} ps -U root | grep "offsite-power-check.sh start" | grep -v "grep" | awk '{print $1}')" != "" ]; then + if [ "$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} ps -U root | grep "offsite-power-check.sh start" | grep -v "grep" | awk '{print $1}')" != "" ]; then echo -e "${idsCL[Green]}Done${idsCL[Default]}" else echo -e "${idsCL[Red]}Not Running${idsCL[Default]}" diff --git a/inc/sites.inc b/inc/sites.inc index 8c382e67..89791eca 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -54,7 +54,7 @@ DELSITE(){ echo fi - [ "${NM_AUTHELIA_IP}" != "" ] && ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} sed -i "/${DEL_SITE}/d" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml + [ "${NM_AUTHELIA_IP}" != "" ] && ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} sed -i "/${DEL_SITE}/d" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml SERVICE_MGMT nginx restart @@ -139,7 +139,7 @@ NEWSITE(){ exit 0 elif [[ ${overwrite} =~ ^[Yy]$ ]]; then rm -f ${nginxconfig} >/dev/null 2>&1 - [ "${NM_AUTHELIA_IP}" != "" ] && ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} sed -i "/${MAIN_SITE}/d" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml + [ "${NM_AUTHELIA_IP}" != "" ] && ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} sed -i "/${MAIN_SITE}/d" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml else exit 0 fi @@ -282,12 +282,12 @@ NEWSITE(){ echo -e "${idsCL[LightGreen]}Configuring Authelia SSO for '${idsCL[Yellow]}${MAIN_SITE}${idsCL[LightGreen]}' {${NGINX_SERVERNAME}}...${idsCL[Default]}" if [ "${SECURE}" == "2FA" ]; then - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "sed -ie \"/domain: # Proxies needing 2 factor below/a ~~~ - \\\"${MAIN_SITE}\\\"\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "sed -ie \"/domain: # Proxies needing 2 factor below/a ~~~ - \\\"${MAIN_SITE}\\\"\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" else - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "sed -ie \"/domain: # Proxies only requiring username and password/a ~~~ - \\\"${MAIN_SITE}\\\"\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "sed -ie \"/domain: # Proxies only requiring username and password/a ~~~ - \\\"${MAIN_SITE}\\\"\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" fi - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "sed -i \"s/~~~/ /g\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "/usr/bin/docker restart authelia >/dev/null 2>&1" + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "sed -i \"s/~~~/ /g\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "/usr/bin/docker restart authelia >/dev/null 2>&1" fi ######################################### LOCAL @@ -474,20 +474,20 @@ NEWPROXYSITE_CREATE(){ if [[ "${SECURE}" = *"FA"* ]]; then echo -en "${idsCL[LightCyan]}Enabling ${SECURE} SSO access ... " sed -i "s/#include conf.d\/include\/secure-access.conf/include conf.d\/include\/secure-access.conf/g" ${nginxconfig} - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} sed -i "/${SITENAME}/d" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} sed -i "/${SITENAME}/d" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml if [ "${SECURE}" == "2FA" ]; then - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "sed -ie \"/domain: # Proxies needing 2 factor below/a ~~~ - \\\"${MAIN_SITE}\\\"\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "sed -ie \"/domain: # Proxies needing 2 factor below/a ~~~ - \\\"${MAIN_SITE}\\\"\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" else - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "sed -ie \"/domain: # Proxies only requiring username and password/a ~~~ - \\\"${MAIN_SITE}\\\"\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "sed -ie \"/domain: # Proxies only requiring username and password/a ~~~ - \\\"${MAIN_SITE}\\\"\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" fi - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "sed -i \"s/~~~/ /g\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "/usr/bin/docker restart authelia >/dev/null 2>&1" + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "sed -i \"s/~~~/ /g\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "/usr/bin/docker restart authelia >/dev/null 2>&1" echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}" echo else echo -en "${idsCL[LightCyan]}Disabling SSO access ... " sed -i "s/include conf.d\/include\/secure-access.conf/#include conf.d\/include\/secure-access.conf/g" ${nginxconfig} - [ "${NM_AUTHELIA_IP}" != "" ] && ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} sed -i "/${SITENAME}/d" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml + [ "${NM_AUTHELIA_IP}" != "" ] && ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} sed -i "/${SITENAME}/d" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml echo -e "${idsCL[LightGreen]}Done${idsCL[Default]}" echo fi @@ -557,7 +557,7 @@ SITEINFO(){ done if [ "${onefacline}" == "" ]; then - [ "$(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1)" != "${NM_AUTHELIA_IP}" ] && ACMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP}" || ACMD="" + [ "$(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1)" != "${NM_AUTHELIA_IP}" ] && ACMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP}" || ACMD="" autheliaconfig=$(${ACMD} cat ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml) onefacline=$(echo "${autheliaconfig}" | grep -Fn one_factor | sort | tail -n1) onefacline=${onefacline%%:*} @@ -627,8 +627,8 @@ SITEINFO(){ sitefacline=${sitefacline%%:*} if [ "${sitefacline}" == "" ]; then SECURE='error' - # ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "sed -ie \"/domain: # Proxies only requiring username and password/a ~~~ - \\\"${SITENAME}\\\"\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" - # ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "sed -i \"s/~~~/ /g\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" + # ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "sed -ie \"/domain: # Proxies only requiring username and password/a ~~~ - \\\"${SITENAME}\\\"\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" + # ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_AUTHELIA_IP} "sed -i \"s/~~~/ /g\" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml" elif [ ${sitefacline} -lt ${onefacline} ]; then SECURE='1FA' elif [ ${sitefacline} -lt ${twofacline} ]; then diff --git a/inc/status.inc b/inc/status.inc index 24661b75..411d4225 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -55,7 +55,7 @@ STATUS(){ fi for NTYPE in "${ntypesel[@]}"; do PH=${NTYPE}_HOSTS[0] - PH_CMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${!PH}" + PH_CMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${!PH}" var=${NTYPE}_REPL_CHECK[@] if [ ! -z ${!var+x} ]; then var=${NTYPE}_HOSTS[@] @@ -212,7 +212,7 @@ STATUS(){ for NTYPE in "${ntypesel[@]}"; do PH=${NTYPE}_HOSTS[0] - PH_CMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${!PH}" + PH_CMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${!PH}" var=${NTYPE}_REPL_CHECK[@] if [ ! -z ${!var+x} ]; then var=${NTYPE}_HOSTS[@] @@ -275,7 +275,7 @@ It was down for $(SHOW_TIME $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${ fi rm -f ${NM_TMPFOLDER}/${nip}~${rcheck}.repl* fi - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} 'find ${NM_REPL_CHECK_LOC[${rcheck}]} -iname "*.sync-conflict-*" -exec rm {} \;' & + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} 'find ${NM_REPL_CHECK_LOC[${rcheck}]} -iname "*.sync-conflict-*" -exec rm {} \;' & fi done @@ -300,7 +300,7 @@ It was down for $(SHOW_TIME $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${ for NTYPE in "${ntypesel[@]}"; do PH=${NTYPE}_HOSTS[0] if [ ! -f ${NM_FOLDER}/${!PH}.down ]; then - PH_CMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${!PH}" + PH_CMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${!PH}" var=${NTYPE}_REPL_CHECK[@] if [ ! -z ${!var+x} ]; then if [ "${PH_CMD}" == "" ]; then @@ -327,7 +327,7 @@ It was down for $(SHOW_TIME $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${ if [ ! -f ${NM_FOLDER}/${!PH}.down ]; then var=${NTYPE}_REPL_CHECK[@] if [ ! -z ${!var+x} ]; then - PH_CMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${!PH}" + PH_CMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${!PH}" for rcheck in "${!var}"; do ${PH_CMD} rm -f ${NM_REPL_CHECK_LOC[${rcheck}]}/test.2023*.repl if [ $(${PH_CMD} ls ${NM_REPL_CHECK_LOC[${rcheck}]}/test.*.repl 2>/dev/null | wc -l) -gt 0 ]; then @@ -359,7 +359,7 @@ It was down for $(SHOW_TIME $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${ var=${NTYPE}_HOSTS[@] for nip in "${!var}"; do if [[ $"{RNIP}" == *"${nip}"* ]]; then NCMD=''; LH='- localhost' - else NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}"; LH='' + else NCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip}"; LH='' fi if [ "${STATUS_ACTION}" != "check" ]; then echo -e " ${idsST[Bold]}${idsCL[LightCyan]}${NM_HOSTNAMES[${nip}]} [${nip}]${idsST[Reset]}${idsCL[LightCyan]} ${idsCL[LightYellow]}${LH}${idsCL[Default]}" @@ -368,7 +368,7 @@ It was down for $(SHOW_TIME $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/${ [ "${STATUS_ACTION}" != "check" ] && [ "${2}" != "report" ] && echo -en " ${idsCL[LightCyan]}Getting drives from server ... ${idsCL[Default]}" declare -A partitions - DRIVEINFO=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} df -BM | grep -vE '^Filesystem|tmpfs|cdrom|@|ram|loop|udev|veeamimage|nvme|localhost|shm|mmcblk|overlay|-volume|Music|Software' | awk '{ print $1 " " $2 " " $4 }') + DRIVEINFO=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} df -BM | grep -vE '^Filesystem|tmpfs|cdrom|@|ram|loop|udev|veeamimage|nvme|localhost|shm|mmcblk|overlay|-volume|Music|Software' | awk '{ print $1 " " $2 " " $4 }') DRIVEINFO=(${DRIVEINFO}) if [ "${2}" != "report" ]; then echo -en "\e[1A" @@ -459,7 +459,7 @@ STATUS_NODE(){ if [[ "${RUN_NODE_IP}" == *"${nip}"* ]]; then NCMD=''; LH='- localhost' else - NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}"; LH='' + NCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip}"; LH='' fi if [ "${NCMD}" != "" ]; then checkhost=$(CHECK_HOST ${nip}) @@ -469,7 +469,7 @@ STATUS_NODE(){ checkhostssl=ok fi if [ "${checkhost}" != "false" ] && [ "${checkhostssl}" == "ok" ]; then - [ "${NODETYPE}" != "OFW" ] && cpu_usage=$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} "/opt/idssys/defaults/get-data.sh cpu-usage") || cpu_usage="" + [ "${NODETYPE}" != "OFW" ] && cpu_usage=$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} "/opt/idssys/defaults/get-data.sh cpu-usage") || cpu_usage="" if [ "${cpu_usage}" != "" ]; then if [ "${NM_HOST_CPULEVELS[${nip}]}" != "" ]; then cpu_warn=$(echo ${NM_HOST_CPULEVELS[${nip}]} | cut -d',' -f 1) @@ -588,7 +588,7 @@ STATUS_NODE(){ mysqlgo=true fi else - if [ "$(ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} ps -U root | grep "offsite-power-check.sh start" | grep -v "grep" | awk '{print $1}')" != "" ]; then + if [ "$(ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} ps -U root | grep "offsite-power-check.sh start" | grep -v "grep" | awk '{print $1}')" != "" ]; then srvctest=active else srvctest=notactive @@ -819,9 +819,9 @@ REPLCHECK(){ checked=false until [ "${checked}" == "" ]; do if [ "${PH_CMD}" == "" ]; then - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} [[ -f ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl ]] && checked=`ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} "cat ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl" | diff - ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl` + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} [[ -f ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl ]] && checked=`ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} "cat ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl" | diff - ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl` else - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} [[ -f ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl ]] && checked="`${PH_CMD} \"ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip} \"cat ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl\" | diff - ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl\"`" + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} [[ -f ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl ]] && checked="`${PH_CMD} \"ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip} \"cat ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl\" | diff - ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl\"`" fi if [ "`date +%s`" -gt "${timeout}" ]; then timeout=true @@ -835,7 +835,7 @@ REPLSTART(){ NODETYPE=${1} PH=${NODETYPE}_HOSTS[0] if [ ! -f ${NM_FOLDER}/${!PH}.down ]; then - PH_CMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${!PH}" + PH_CMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${!PH}" var=${NODETYPE}_REPL_CHECK[@] if [ ! -z ${!var+x} ]; then for rcheck in "${!var}"; do diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 25de966f..f867fc6d 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -60,7 +60,7 @@ SET-PERMISSIONS(){ if [[ ${RUN_NODE_IP} == *"${nip}"* ]]; then NCMD='' else - NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}" + NCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip}" fi if [ "${2}" != "q" ]; then echo -en "${idsCL[Yellow]}Resetting folder permissions for Gitea on ${NM_HOSTNAMES[${nip}]} (${nip})... ${idsCL[Default]}" @@ -83,7 +83,7 @@ SET-PERMISSIONS(){ if [[ ${RUN_NODE_IP} == *"${nip}"* ]]; then NCMD='' else - NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}" + NCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip}" fi if [ "${2}" != "q" ]; then echo -en "${idsCL[Yellow]}Resetting folder permissions for PowerDNS-Admin on ${NM_HOSTNAMES[${nip}]} (${nip})... ${idsCL[Default]}" @@ -104,7 +104,7 @@ SET-PERMISSIONS(){ if [[ ${RUN_NODE_IP} == *"${nip}"* ]]; then NCMD='' else - NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}" + NCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip}" fi if [ "${2}" != "q" ]; then echo -en "${idsCL[Yellow]}Resetting folder permissions for Nextcloud on ${NM_HOSTNAMES[${nip}]} (${nip})... ${idsCL[Default]}" @@ -134,7 +134,7 @@ SET-PERMISSIONS(){ nip='localhost ' NCMD='' else - NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}" + NCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip}" fi echo -e "${idsCL[Yellow]}Setting folder permissions for ${NM_HOSTNAMES[${nip}]} (${nip})${idsCL[Default]}" echo -en "${idsCL[Cyan]}LetsEncrypt Certs ${idsCL[Default]}" @@ -153,7 +153,7 @@ SET-PERMISSIONS(){ nip='localhost ' NCMD='' else - NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}" + NCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip}" fi if [ "${NEW_SITE}" != "" ]; then echo -en "${idsCL[Cyan]}${NM_HOSTNAMES[${nip}]} (${nip}) ${idsCL[Default]}" @@ -197,7 +197,7 @@ HAPROXY-CONFIG() { nip='localhost ' NCMD='' else - NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}" + NCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip}" fi echo -en "Creating File on ${NM_HOSTNAMES[${nip}]} ($nip)... ${idsCL[Default]}" @@ -216,7 +216,7 @@ HAPROXY-CONFIG() { nip='localhost ' NCMD='' else - NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}" + NCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip}" fi echo -en "Creating File on ${NM_HOSTNAMES[${nip}]} ($nip)... ${idsCL[Default]}" @@ -234,7 +234,7 @@ HAPROXY-CONFIG() { nip='localhost ' NCMD='' else - NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}" + NCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip}" fi echo -en "Creating File on ${NM_HOSTNAMES[${nip}]} ($nip)... ${idsCL[Default]}" @@ -262,7 +262,7 @@ KEEPALIVE-CONFIG() { nip='localhost ' NCMD='' else - NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}" + NCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip}" fi echo -en "Creating File on ${NM_HOSTNAMES[${nip}]} ($nip)... ${idsCL[Default]}" @@ -281,7 +281,7 @@ KEEPALIVE-CONFIG() { nip='localhost ' NCMD='' else - NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}" + NCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip}" fi echo -en "Creating File on ${NM_HOSTNAMES[${nip}]} ($nip)... ${idsCL[Default]}" @@ -314,7 +314,7 @@ NODEUPDATES() { echo -e "${idsCL[LightGreen]}Updating All Nodes${idsCL[Default]}" echo -e "${idsCL[LightGreen]}-------------------------------------------${idsCL[Default]}" - [ "${RUN_NODE_TYPE}" == "nm" ] && NMCMD="" || NMCMD="ssh -tq -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NM_NODEMANAGER}" + [ "${RUN_NODE_TYPE}" == "nm" ] && NMCMD="" || NMCMD="ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NM_NODEMANAGER}" betacheck=$(BETACHECK) if [ "${2}" != "sync" ]; then @@ -369,7 +369,7 @@ NODEUPDATE(){ else noup=0 fi - NCMD="ssh -tq -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}" + NCMD="ssh -tq -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip}" NODE="${NM_HOSTNAMES[${nip}]} [${nip}]" tmpfile=/tmp/.nodeupdate.${NM_HOSTNAMES[${nip}]// /-} touch ${tmpfile}.running @@ -544,9 +544,9 @@ BACKUP_OFFSITEPFSENSE(){ WeeklyBackupsToKeep=8 MonthlyBackupsToKeep=3 - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${OFFSITE_PFSENSE_IP} tar -c -f /cf/conf/conf_backup.tar.gz /cf/conf + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${OFFSITE_PFSENSE_IP} tar -c -f /cf/conf/conf_backup.tar.gz /cf/conf scp root@${OFFSITE_PFSENSE_IP}:/cf/conf/conf* ${BAKFOLDER}/${newBAKFOLDER}/ - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${OFFSITE_PFSENSE_IP} rm -f /cf/conf/conf_backup.tar.gz + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${OFFSITE_PFSENSE_IP} rm -f /cf/conf/conf_backup.tar.gz cd ${BAKFOLDER} if [ "$(date +%d)" == "${DOM}" ] && [ "$(date +%u)" == "${DOW}" ]; then @@ -583,7 +583,7 @@ BACKUP_OFFSITEPFSENSE(){ done; if [ $keep == 0 ]; then delFolder="D:\\Offsite-pfSense_Backups\\${folder##*/}" - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 backup@10.10.1.60 rmdir /S /Q "${delFolder}" + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 backup@10.10.1.60 rmdir /S /Q "${delFolder}" fi fi done @@ -615,10 +615,10 @@ BACKUP_UNIFIUDM(){ WeeklyBackupsToKeep=8 MonthlyBackupsToKeep=3 - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${UNIFIUDM_IP} tar -c -f /volume1/data_backup.tar.gz /data - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${UNIFIUDM_IP} tar -c -f /volume1/root_backup.tar.gz /root + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFIUDM_IP} tar -c -f /volume1/data_backup.tar.gz /data + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFIUDM_IP} tar -c -f /volume1/root_backup.tar.gz /root scp root@${UNIFIUDM_IP}:/volume1/*_backup.tar.gz ${BAKFOLDER}/${newBAKFOLDER}/ - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${UNIFIUDM_IP} rm -f /volume1/*_backup.tar.gz + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFIUDM_IP} rm -f /volume1/*_backup.tar.gz cd ${BAKFOLDER} if [ "$(date +%d)" == "${DOM}" ] && [ "$(date +%u)" == "${DOW}" ]; then @@ -655,7 +655,7 @@ BACKUP_UNIFIUDM(){ done; if [ $keep == 0 ]; then delFolder="D:\\UniFi-UDM_Backups\\${folder##*/}" - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 backup@10.10.1.60 rmdir /S /Q "${delFolder}" + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 backup@10.10.1.60 rmdir /S /Q "${delFolder}" fi fi done @@ -687,12 +687,12 @@ BACKUP_UNIFINVR(){ WeeklyBackupsToKeep=8 MonthlyBackupsToKeep=3 - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${UNIFINVR_IP} tar -c -f /volume1/data_backup.tar.gz /data - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${UNIFINVR_IP} tar -c -f /volume1/root_backup.tar.gz /root - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${UNIFINVR_IP} tar -c -f /volume1/unifi_backup.tar.gz /volume1/.srv/unifi-protect/backups /volume1/.srv/unifi-protect/data /volume1/.srv/unifi-protect/dbBackups + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFINVR_IP} tar -c -f /volume1/data_backup.tar.gz /data + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFINVR_IP} tar -c -f /volume1/root_backup.tar.gz /root + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFINVR_IP} tar -c -f /volume1/unifi_backup.tar.gz /volume1/.srv/unifi-protect/backups /volume1/.srv/unifi-protect/data /volume1/.srv/unifi-protect/dbBackups scp root@${UNIFINVR_IP}:/volume1/*_backup.tar.gz ${BAKFOLDER}/${newBAKFOLDER}/ - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${UNIFINVR_IP} rm -f /volume1/*_backup.tar.gz + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${UNIFINVR_IP} rm -f /volume1/*_backup.tar.gz cd ${BAKFOLDER} if [ "$(date +%d)" == "${DOM}" ] && [ "$(date +%u)" == "${DOW}" ]; then @@ -729,7 +729,7 @@ BACKUP_UNIFINVR(){ done; if [ $keep == 0 ]; then delFolder="D:\\UniFi-NVR_Backups\\${folder##*/}" - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 backup@10.10.1.60 rmdir /S /Q "${delFolder}" + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 backup@10.10.1.60 rmdir /S /Q "${delFolder}" fi fi done @@ -753,7 +753,7 @@ RUN_COMMAND(){ var=${NTYPE}_HOSTS[@] for nip in "${!var}"; do if [[ ${RUN_NODE_IP} == *"${nip}"* ]]; then NCMD=''; LH='- localhost' - else NCMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${nip}"; LH='' + else NCMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${nip}"; LH='' fi echo -e " ${idsST[Bold]}${idsCL[LightCyan]}${NM_HOSTNAMES[${nip}]}[${nip}]${idsST[Reset]}${idsCL[LightCyan]} ${idsCL[LightYellow]}${LH}${idsCL[Default]}" DIVIDER false green @@ -1019,7 +1019,7 @@ MAINTENANCE_MODE(){ DIVIDER . lightCyan ${DV_LEN} fi PH=${NTYPE}_HOSTS[0] - PH_CMD="ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${!PH}" + PH_CMD="ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${!PH}" var2=${NTYPE}_HOSTS[@] for nip in "${!hosts}"; do echo -e " ${idsCL[Green]}${NM_HOSTNAMES[${!PH}]}[${!PH}] <--> ${idsST[Bold]}${NM_HOSTNAMES[${nip}]}[${nip}]${idsST[Reset]}${idsCL[Default]}" @@ -1059,8 +1059,8 @@ ESXI_ISCSI_STORAGE_RESCAN(){ for NIP in "${ESXIHOSTS[@]}"; do if [ $(CHECK_HOST ${NIP}) == true ]; then - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NIP} esxcli storage core adapter rescan --all & - ssh -q -o ConnectTimeout=1 -o ConnectionAttempts=1 root@${NIP} vmkfstools -V & + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NIP} esxcli storage core adapter rescan --all & + ssh -q -o ConnectTimeout=3 -o ConnectionAttempts=1 root@${NIP} vmkfstools -V & fi done