This commit is contained in:
2019-02-04 00:09:23 -06:00
parent 9c6687b5be
commit 41db700df0
2 changed files with 9 additions and 5 deletions

View File

@@ -48,4 +48,9 @@ DISP_HEADER(){
echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}" echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}"
fi fi
echo "" echo ""
}
DIVIDER(){
echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}"
echo ""
} }

View File

@@ -20,7 +20,6 @@ source /opt/idssys/nodemgmt/defaults.inc
STATUS() { STATUS() {
if [ ! -z ${LOCAL_SERVICES+x} ]; then if [ ! -z ${LOCAL_SERVICES+x} ]; then
lip=$(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) lip=$(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1)
echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}"
echo -e "Node hostname: ${idsST[Bold]}${idsCL[LightCyan]}${NODE_HOSTNAME} (${lip})${idsST[Reset]}${idsCL[LightCyan]} - localhost${idsCL[Default]}" echo -e "Node hostname: ${idsST[Bold]}${idsCL[LightCyan]}${NODE_HOSTNAME} (${lip})${idsST[Reset]}${idsCL[LightCyan]} - localhost${idsCL[Default]}"
for srvc in "${LOCAL_SERVICES[@]}" for srvc in "${LOCAL_SERVICES[@]}"
do do
@@ -40,7 +39,7 @@ STATUS() {
else NCMD="ssh root@${nip}"; LH='' else NCMD="ssh root@${nip}"; LH=''
fi fi
echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}" DIVIDER()
echo -e "Node hostname: ${idsST[Bold]}${idsCL[LightCyan]}iDS-Node${nid} (${nip})${idsST[Reset]}${idsCL[LightCyan]} ${LH}${idsCL[Default]}" echo -e "Node hostname: ${idsST[Bold]}${idsCL[LightCyan]}iDS-Node${nid} (${nip})${idsST[Reset]}${idsCL[LightCyan]} ${LH}${idsCL[Default]}"
for srvc in "${NODE_SERVICES[@]}" for srvc in "${NODE_SERVICES[@]}"
do do
@@ -54,7 +53,7 @@ STATUS() {
nid=`expr $nid + 1` nid=`expr $nid + 1`
done done
echo -e "${idsCL[Yellow]}-------------------------------------------------------------${idsCL[Default]}" DIVIDER()
echo "" echo ""
if [ -z $action ] && "${action}" = "gui" ]; then if [ -z $action ] && "${action}" = "gui" ]; then
read -n 1 -s -p "Press any key to continue" read -n 1 -s -p "Press any key to continue"
@@ -463,9 +462,9 @@ if [ ${action-x} ]; then
delsite) DELSITE ${2};; delsite) DELSITE ${2};;
newsite) NEWSITE ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14};; newsite) NEWSITE ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14};;
update) ;; update) ;;
status) STATUS ${2};; status) DIVIDER; STATUS ${2};;
status-check) STATUS-CHECK ${2};; status-check) STATUS-CHECK ${2};;
set-permissions) SET-PERMISSIONS ${2};; set-permissions) DIVIDER; SET-PERMISSIONS ${2};;
service) SERVICE ${2} ${3};; service) SERVICE ${2} ${3};;
gui) GUI;; gui) GUI;;
*) *)