voltron/NodeMgmt
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

update

Browse Source
This commit is contained in:
David Schroeder
2025-06-30 18:48:57 -05:00
parent f81a49c60e
commit adeef4ac73
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
inc/services.inc
View File

@@ -214,11 +214,10 @@ SERVICE_MGMT(){
[ ${QUIET} -eq 0 ] && echo -en "${NM_SRVCOPTS[${SERVICE['action']}]}ing on '$nip'... ${idsCL[Default]}"
checkhost=$(CHECK_HOST ${nip})
if [ "${checkhost}" != "false" ]; then
#${NCMD} systemctl ${SERVICE['action']} ${SERVICE['service']} > /dev/null 2>&1
if [ ${QUIET} -eq 0 ]; then
if [[ "enable,disable" = *"${SERVICE['action']}"* ]] || [ "${SERVICE['service']}" = "daemon-reload" ]; then
echo -e "${idsCL[Green]}Done${idsCL[Default]}"
elif [ "$(${NCMD} systemctl is-active ${SERVICE['service']})" = "active" ]; then
elif [ "$(${NCMD} systemctl is-active ${SERVICE['service']} | tr -d $'\r')" = "active" ]; then
echo -e "${idsCL[Green]}Done${idsCL[Default]}"
elif [ "${SERVICE['action']}" = "stop" ]; then
echo -e "${idsCL[Red]}STOPPED${idsCL[Default]}"
@@ -455,14 +454,14 @@ SERVICE_MGMT(){
echo
fi
if [ ${QUIET} -eq 0 ] && [ "${SERVICE['action']}" != "status" ]; then
echo -e "\n ${NCMD} systemctl is-active ${SERVICE['service']}) = active"
SStatus=$(${NCMD} systemctl is-active ${SERVICE['service']} | tr -d $'\r')
if [[ "enable,disable" = *"${SERVICE['action']}"* ]] || [ "${SERVICE['service']}" = "daemon-reload" ]; then
echo -e "${idsCL[Green]}Done${idsCL[Default]}"
elif [[ "${srva}" = *".socket"* ]] && [ "$(${NCMD} systemctl is-active ${SERVICE['service']})" = "active" ]; then
elif [[ "${srva}" = *".socket"* ]] && [ "${SStatus}" = "active" ]; then
echo -e "${idsCL[Green]}Done (& socket service)${idsCL[Default]}"
elif [[ "${srva}" = *"@pdns"* ]] && [ "$(${NCMD} systemctl is-active ${SERVICE['service']})" = "active" ]; then
elif [[ "${srva}" = *"@pdns"* ]] && [ "${SStatus}" = "active" ]; then
echo -e "${idsCL[Green]}Done (& @pdns)${idsCL[Default]}"
elif [ "$(${NCMD} systemctl is-active ${SERVICE['service']})" = "active" ]; then
elif [ "${SStatus}" = "active" ]; then
echo -e "${idsCL[Green]}Done${idsCL[Default]}"
elif [ "${SERVICE['action']}" = "stop" ]; then
echo -e "${idsCL[Red]}STOPPED${idsCL[Default]}"