update
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
# NodeMgmt - Node Management Scripts
|
||||
|
||||
ACTION="${1}"
|
||||
NMG_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 ${NMG_ACTION} ] || [ "${NMG_ACTION}" = "gui" ]; then
|
||||
ENTER2CONTINUE
|
||||
fi
|
||||
}
|
||||
@@ -180,7 +180,7 @@ SET-PERMISSIONS(){
|
||||
fi
|
||||
done
|
||||
if [ "${NEW_SITE}" != "" ]; then echo ; fi
|
||||
if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then
|
||||
if [ -z ${NMG_ACTION} ] || [ "${NMG_ACTION}" = "gui" ]; then
|
||||
ENTER2CONTINUE
|
||||
fi
|
||||
fi
|
||||
@@ -606,7 +606,7 @@ DOWNLIST(){
|
||||
DOWNLIST=${DOWN_LIST}
|
||||
fi
|
||||
|
||||
if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then
|
||||
if [ -z ${NMG_ACTION} ] || [ "${NMG_ACTION}" = "gui" ]; then
|
||||
DIVIDER true
|
||||
fi
|
||||
echo
|
||||
@@ -727,7 +727,7 @@ DOWNLIST(){
|
||||
echo
|
||||
|
||||
fi
|
||||
if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then
|
||||
if [ -z ${NMG_ACTION} ] || [ "${NMG_ACTION}" = "gui" ]; then
|
||||
DIVIDER true
|
||||
ENTER2CONTINUE
|
||||
fi
|
||||
@@ -738,11 +738,11 @@ MAINTENANCE_MODE(){
|
||||
if [ "${NM_NODETYPES[${1^^}]}" != "" ]; then
|
||||
ntss=${1^^}
|
||||
ntypesel=(${ntss})
|
||||
NMG_ACTION=${2}
|
||||
STATUS_ACTION=${2}
|
||||
else
|
||||
ntss=""
|
||||
ntypesel=(${NM_NODE_TYPES[@]})
|
||||
[ "${1}" == "sync" ] && NMG_ACTION=repl || NMG_ACTION=${1}
|
||||
[ "${1}" == "sync" ] && STATUS_ACTION=repl || STATUS_ACTION=${1}
|
||||
fi
|
||||
|
||||
PRI_CW=40
|
||||
@@ -755,7 +755,7 @@ MAINTENANCE_MODE(){
|
||||
|
||||
NTHOSTS=${NODETYPE}_HOSTS[@]
|
||||
|
||||
if ([[ ! -v ${NODETYPE}_DOCKERS_CHECK ]] && [ "${NMG_ACTION}" == "dockers" ]) || ([ "${NM_SERVICES_CHECK[${NODETYPE}]}" == "" ] && [ "${NMG_ACTION}" == "services" ]); then
|
||||
if ([[ ! -v ${NODETYPE}_DOCKERS_CHECK ]] && [ "${STATUS_ACTION}" == "dockers" ]) || ([ "${NM_SERVICES_CHECK[${NODETYPE}]}" == "" ] && [ "${STATUS_ACTION}" == "services" ]); then
|
||||
GOFORCHECK=false;
|
||||
else
|
||||
GOFORCHECK=true;
|
||||
@@ -763,9 +763,9 @@ MAINTENANCE_MODE(){
|
||||
|
||||
if [ ${GOFORCHECK} = true ]; then
|
||||
|
||||
if [ "${NMG_ACTION}" != "check" ]; then
|
||||
if [ "${STATUS_ACTION}" != "check" ]; then
|
||||
echo -e "${idsST[Bold]}"; DIVIDER
|
||||
if [ "${NMG_ACTION}" == "dockers" ]; then
|
||||
if [ "${STATUS_ACTION}" == "dockers" ]; then
|
||||
echo -e "${idsCL[LightYellow]} ${NM_NODETYPES[$NTYPE]}-Node Docker Status${idsCL[Default]}"
|
||||
else
|
||||
echo -e "${idsCL[LightYellow]} ${NM_NODETYPES[$NTYPE]}-Node Service Status${idsCL[Default]}"
|
||||
@@ -780,7 +780,7 @@ MAINTENANCE_MODE(){
|
||||
########################
|
||||
## SERVICES CHECK
|
||||
########################
|
||||
if [ "${NMG_ACTION}" != "dockers" ] && [ "${NM_SERVICES_CHECK[${NODETYPE}]}" != "" ]; then
|
||||
if [ "${STATUS_ACTION}" != "dockers" ] && [ "${NM_SERVICES_CHECK[${NODETYPE}]}" != "" ]; then
|
||||
echo -e "${idsCL[Green]} System Service(s) Status${idsCL[Default]}"
|
||||
DIVIDER . green 52
|
||||
|
||||
@@ -791,7 +791,8 @@ MAINTENANCE_MODE(){
|
||||
spc1=${cw}-${#NM_SERVICE_DESC[${srvc}]}
|
||||
until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
|
||||
echo -en "${idsCL[White]} ${NM_SERVICE_DESC[${srvc}]}${spc}${idsCL[Default]}: "
|
||||
echo -e "${idsCL[LightGreen]}Running${idsCL[Default]}"
|
||||
|
||||
echo -e "${idsCL[LightGreen]}here${idsCL[Default]}"
|
||||
done
|
||||
|
||||
fi
|
||||
@@ -799,9 +800,9 @@ MAINTENANCE_MODE(){
|
||||
########################
|
||||
## DOCKER CHECK
|
||||
########################
|
||||
if [[ -v ${NODETYPE}_DOCKERS_CHECK ]] && [ "${NMG_ACTION}" != "services" ]; then
|
||||
if [ "${NMG_ACTION}" != "check" ]; then
|
||||
[ "${NMG_ACTION}" == "" ] && [ "${NM_SERVICES_CHECK[${NODETYPE}]}" != "" ] && echo
|
||||
if [[ -v ${NODETYPE}_DOCKERS_CHECK ]] && [ "${STATUS_ACTION}" != "services" ]; then
|
||||
if [ "${STATUS_ACTION}" != "check" ]; then
|
||||
[ "${STATUS_ACTION}" == "" ] && [ "${NM_SERVICES_CHECK[${NODETYPE}]}" != "" ] && echo
|
||||
echo -e "${idsCL[Green]} Docker Service(s) Status${idsCL[Default]}"
|
||||
DIVIDER . green 52
|
||||
fi
|
||||
@@ -810,7 +811,8 @@ MAINTENANCE_MODE(){
|
||||
spc1=`expr ${cw} - ${#NM_DOCKER_DESC[${docker}]}`
|
||||
until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done
|
||||
echo -en "${idsCL[White]} ${NM_DOCKER_DESC[${docker}]}$spc${idsCL[Default]}: "
|
||||
echo -en "${idsCL[LightGreen]}Running${idsCL[Default]}"
|
||||
|
||||
echo -e "${idsCL[LightGreen]}here${idsCL[Default]}"
|
||||
done
|
||||
fi
|
||||
|
||||
@@ -918,7 +920,7 @@ GUI(){
|
||||
if [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]] && [[ "${noheader}" != *" ${3} "* ]] && [ "${2}" != "q" ] && [ "${3}" != "q" ]; then
|
||||
DISP_HEADER
|
||||
fi
|
||||
case ${ACTION} in
|
||||
case ${NMG_ACTION} in
|
||||
newcert) NEWCERT ${2} ${3};;
|
||||
certrenew) CERTRENEW;;
|
||||
delcert) DEL-SSL ${2};;
|
||||
@@ -1019,7 +1021,7 @@ GUI(){
|
||||
${NM_SCRIPT} status ${2} ${3} ${4}
|
||||
exit 0
|
||||
else
|
||||
[ "${NMG_ACTION}" != "report" ] && echo -e "${idsCL[LightRed]}Whooooaaaaa there cowboy, we got 3 threads running already.... easy killer!${idsCL[Default]}\n"
|
||||
[ "${STATUS_ACTION}" != "report" ] && echo -e "${idsCL[LightRed]}Whooooaaaaa there cowboy, we got 3 threads running already.... easy killer!${idsCL[Default]}\n"
|
||||
if [ ! -f ${NM_TMPFOLDER}/.overload ] || [ $(expr $(date +%s) - $(stat -c %Y ${NM_TMPFOLDER}/.overload)) -ge 600 ]; then
|
||||
SENDNOTICE "NODEMGMT OVERLOAD" "Whooooaaaaa there cowboy, we got 3 threads running already.... easy killer!" 1
|
||||
touch ${NM_TMPFOLDER}/.overload
|
||||
@@ -1029,7 +1031,6 @@ GUI(){
|
||||
fi
|
||||
fi;;
|
||||
scantimes) STATUS_SCANTIMES ${2} ${3} ${4} ${5};;
|
||||
checkdocker) CHECK_DOCKER_SERVICES ${2};;
|
||||
set-permissions) SET-PERMISSIONS ${2};;
|
||||
service)
|
||||
if [[ ( "${2}" = "giteaxx" ) || ( "${2}" = "powerdns-adminxx" ) ]] && [ "${3}" = "start" ]; then
|
||||
|
||||
Reference in New Issue
Block a user