update
This commit is contained in:
@@ -70,7 +70,7 @@ NEWCERT(){
|
||||
tmp=''
|
||||
else
|
||||
echo
|
||||
SERVICE nginx restart
|
||||
SERVICE_MGMT nginx restart
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
@@ -142,7 +142,7 @@ CERTRENEW(){
|
||||
echo -e "${daterun}" >> ${NM_LOGFOLDER}/cert-renewal.lastrun
|
||||
DIVIDER true
|
||||
echo
|
||||
SERVICE nginx reload >> ${NM_LOGFOLDER}/cert-renewal.lastrun
|
||||
SERVICE_MGMT nginx reload >> ${NM_LOGFOLDER}/cert-renewal.lastrun
|
||||
echo -e "${idsCL[LightGreen]}The certificates have been renewed.${idsCL[Default]}"
|
||||
echo
|
||||
if [ -z $action ] || [ "${action}" = "gui" ]; then
|
||||
@@ -155,7 +155,7 @@ NIGHTLYRENEW(){
|
||||
CONCAT_SSL
|
||||
chown -R root:le ${NM_CERTPATH}
|
||||
chmod -R 6775 ${NM_CERTPATH}
|
||||
SERVICE nginx reload >> ${NM_LOGFOLDER}/cert-renewal.lastrun
|
||||
SERVICE_MGMT nginx reload >> ${NM_LOGFOLDER}/cert-renewal.lastrun
|
||||
}
|
||||
|
||||
CONCAT_SSL(){
|
||||
|
||||
219
inc/services.inc
219
inc/services.inc
@@ -84,10 +84,78 @@ SINGLE_SERVER_SERVICE_CHECK(){
|
||||
fi
|
||||
}
|
||||
|
||||
SERVICE(){
|
||||
SERVICE_MGMT(){
|
||||
declare -A SERVICE
|
||||
QUIET=0
|
||||
while [ $# -gt 0 ]; do
|
||||
case "${1}" in
|
||||
-s|-service) SERVICE['service']=${2,,};;
|
||||
-n|-node) SERVICE['node']=${2^^};;
|
||||
-nt|-nodetype) SERVICE['nodetype']=${2^^};;
|
||||
-a|-action) SERVICE['action']=${2,,};;
|
||||
-q|-quiet) QUIET=1;;
|
||||
-*)
|
||||
if [ "${NM_SERVICE_DESC[${1}]}" != "" ]; then
|
||||
SERVICE['service']=${1}
|
||||
|
||||
elif [ "${NM_SRVCOPTS[${1}]}" != "" ]; then
|
||||
SERVICE['action']=${1}
|
||||
|
||||
elif [ "${NM_HOSTNAMES[${1}]}" != "" ]; then
|
||||
SERVICE['node']=${1}
|
||||
|
||||
elif [ "${1}" == "q" ]; then
|
||||
SERVICE['node']=${1}
|
||||
|
||||
else
|
||||
[ "${1}" != "-h" ] && echo -e "Invalid command\n"
|
||||
echo -e "Usage: ${idsCL[Yellow]}[nodemgmt or nmg] service${idsCL[Default]} {"
|
||||
width=35
|
||||
printf "%-${width}s- %s\n" " -s|-service {service}" "Name of service to manage"
|
||||
printf "%-${width}s- %s\n" " -n|-node {node-lan-ip}" "Node to run on"
|
||||
printf "%-${width}s- %s\n" " -nt|-nodetype {nodetype}" "NodeType to run on, or all. Defaults to local nodetype"
|
||||
printf "%-${width}s- %s\n" " -a|-action {action}" "Action to perform; start, stop, restart etc"
|
||||
printf "%-${width}s- %s\n" " -q|-quiet" "Do not output, typically used from cron jobs"
|
||||
echo -e "}\n"
|
||||
exit 0
|
||||
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
shift
|
||||
done
|
||||
if [ "${NM_SERVICE_DESC[${SERVICE['service']}]}" == "" ]; then
|
||||
echo -e "${idsCL[Red]}"${SERVICE['service']}" is an unknown Service.${idsCL[Default]}"
|
||||
exit 1
|
||||
fi
|
||||
# [ "${SERVICE['nodetype']}" == "" ] && SERVICE['nodetype']=
|
||||
|
||||
if [ "${SERVICE['nodetype']}" == "all" ]; then
|
||||
NTS=(${NM_NODE_TYPES[*]})
|
||||
|
||||
elif [ "${SERVICE['nodetype']}" != "" ]; then
|
||||
if [ "${NM_HOSTS[${SERVICE['nodetype']}]}" != "" ]; then
|
||||
NT_HOSTS=${SERVICE['nodetype']}_HOSTS[@]
|
||||
NT_HOST=${SERVICE['nodetype']}_HOSTS[0]
|
||||
NTS=("${SERVICE['nodetype']}");
|
||||
else
|
||||
echo -e "${idsCL[Red]}"${SERVICE['nodetype']}" is an unknown NodeType.${idsCL[Default]}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
elif [ "${RUN_NODE_TYPE}" != "" ]; then
|
||||
NT_HOSTS=${RUN_NODE_TYPE}_HOSTS[@]
|
||||
NT_HOST=${RUN_NODE_TYPE}_HOSTS[0]
|
||||
NTS=("${RUN_NODE_TYPE}");
|
||||
|
||||
# else
|
||||
# NTS=(${NM_NODE_TYPES[*]})
|
||||
fi
|
||||
|
||||
|
||||
#var=NC_HOSTS[@]
|
||||
|
||||
if [ "$1" = "glusterd" ]; then
|
||||
if [ "${SERVICE['service']}" = "glusterd" ]; then
|
||||
|
||||
for nip in "${GL_HOSTS[@]}"; do
|
||||
if [[ "${RUN_NODE_IP}" == *"${nip}"* ]]; then
|
||||
@@ -97,30 +165,28 @@ SERVICE(){
|
||||
NCMD="ssh root@${nip}"
|
||||
fi
|
||||
|
||||
if [ "${3}" != "q" ]; then
|
||||
echo -en "${NM_SRVCOPTS[${2}]}ing on '$nip'... ${idsCL[Default]}"
|
||||
fi
|
||||
[ ${QUIET} -eq 0 ] && echo -en "${NM_SRVCOPTS[${SERVICE['action']}]}ing on '$nip'... ${idsCL[Default]}"
|
||||
checkhost=$(CHECK_HOST ${nip})
|
||||
if [ "${checkhost}" != "false" ]; then
|
||||
#${NCMD} systemctl $2 $1 > /dev/null 2>&1
|
||||
if [ "${3}" != "q" ]; then
|
||||
if [[ "enable,disable" = *"${2}"* ]] || [ "${1}" = "daemon-reload" ]; 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 ${1})" = "active" ]; then
|
||||
elif [ "$(${NCMD} systemctl is-active ${SERVICE['service']})" = "active" ]; then
|
||||
echo -e "${idsCL[Green]}Done${idsCL[Default]}"
|
||||
elif [ "$2" = "stop" ]; then
|
||||
elif [ "${SERVICE['action']}" = "stop" ]; then
|
||||
echo -e "${idsCL[Red]}STOPPED${idsCL[Default]}"
|
||||
else
|
||||
echo -e "${idsCL[Red]}ERROR${idsCL[Default]}"
|
||||
fi
|
||||
fi
|
||||
elif [ "${3}" != "q" ]; then
|
||||
elif [ ${QUIET} -eq 0 ]; then
|
||||
echo -e "${idsCL[Red]}Node is Down${idsCL[Default]}"
|
||||
fi
|
||||
|
||||
done
|
||||
|
||||
if [ "${2}" = "start" ] || [ "${2}" = "restart" ]; then
|
||||
if [ "${SERVICE['action']}" = "start" ] || [ "${SERVICE['action']}" = "restart" ]; then
|
||||
|
||||
echo
|
||||
sleep 5s
|
||||
@@ -133,13 +199,13 @@ SERVICE(){
|
||||
NCMD="ssh root@${nip}"
|
||||
fi
|
||||
|
||||
if [ "${3}" != "q" ]; then
|
||||
if [ ${QUIET} -eq 0 ]; then
|
||||
echo -en "Mounting drive on '$nip'... ${idsCL[Default]}"
|
||||
fi
|
||||
checkhost=$(CHECK_HOST ${nip})
|
||||
if [ "${checkhost}" != "false" ]; then
|
||||
#${NCMD} mount -a > /dev/null 2>&1
|
||||
if [ "${3}" != "q" ]; then
|
||||
if [ ${QUIET} -eq 0 ]; then
|
||||
# if [[ "${NCHOSTS}" == *"${nip}"* ]]; then
|
||||
if [[ " ${NC_HOSTS[*]} " =~ " ${nip} " ]]; then
|
||||
mntpath="/mnt/Nextcloud-Data"
|
||||
@@ -166,7 +232,7 @@ SERVICE(){
|
||||
fi
|
||||
fi
|
||||
|
||||
elif [ "${3}" != "q" ]; then
|
||||
elif [ ${QUIET} -eq 0 ]; then
|
||||
echo -e "${idsCL[Red]}Node is Down${idsCL[Default]}"
|
||||
fi
|
||||
|
||||
@@ -176,48 +242,37 @@ SERVICE(){
|
||||
|
||||
|
||||
else
|
||||
if [ "${4}" != "all" ]; then
|
||||
if [ "${RUN_NODE_TYPE}" != "" ]; then
|
||||
NT_HOSTS=${RUN_NODE_TYPE}_HOSTS[@]
|
||||
NT_HOST=${RUN_NODE_TYPE}_HOSTS[0]
|
||||
NTS=("${RUN_NODE_TYPE}");
|
||||
else
|
||||
NTS=(${NM_NODE_TYPES[*]})
|
||||
fi
|
||||
|
||||
else
|
||||
NTS=(${NM_NODE_TYPES[*]})
|
||||
fi
|
||||
|
||||
|
||||
# if [ "${RUN_NODE_TYPE}" == "" ]; then
|
||||
#
|
||||
# fi
|
||||
|
||||
if [ "${3}" != "q" ]; then
|
||||
if [ "${NM_SERVICE_DESC[${1}]}" = "" ]; then
|
||||
echo -e "${idsCL[Red]}(${1}) is not an allowed service.${idsCL[Default]}"
|
||||
if [ ${QUIET} -eq 0 ]; then
|
||||
if [ "${NM_SERVICE_DESC[${SERVICE['service']}]}" = "" ]; then
|
||||
echo -e "${idsCL[Red]}(${SERVICE['service']}) is not an allowed service.${idsCL[Default]}"
|
||||
exit 1
|
||||
fi
|
||||
if [ "${NM_SRVCOPTS[${2}]}" = "" ]; then
|
||||
echo -e "${idsCL[Red]}(${2}) is not an allowed service action.${idsCL[Default]}"
|
||||
if [ "${NM_SRVCOPTS[${SERVICE['action']}]}" = "" ]; then
|
||||
echo -e "${idsCL[Red]}(${SERVICE['action']}) is not an allowed service action.${idsCL[Default]}"
|
||||
exit 1
|
||||
fi
|
||||
if [ "$2" = "start" ] && [ "$1" = "haproxy" ]; then
|
||||
if [ "${SERVICE['action']}" = "start" ] && [ "${SERVICE['service']}" = "haproxy" ]; then
|
||||
TACT='restart'
|
||||
else
|
||||
TACT="${2}"
|
||||
TACT="${SERVICE['action']}"
|
||||
fi
|
||||
|
||||
echo
|
||||
echo -e "${idsCL[LightGreen]}[[ ${NM_SERVICE_DESC[${1}]} ${NM_SRVCOPTS[${2}]}ing ]]${idsCL[Default]}"
|
||||
echo -e "${idsCL[LightGreen]}[[ ${NM_SERVICE_DESC[${SERVICE['service']}]} ${NM_SRVCOPTS[${SERVICE['action']}]}ing ]]${idsCL[Default]}"
|
||||
echo -e "${idsCL[LightGreen]}-------------------------------------------${idsCL[Default]}"
|
||||
fi
|
||||
|
||||
|
||||
if [ "${1}" = "nginx" ] && ([ "${3}" == "" ] || [ "${3}" == "all" ]); then
|
||||
if [ "${RUN_NODE_TYPE}" != "" ] && [ "${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}" != "" ] && ([ "${2}" = "restart" ] || [ "${2}" = "reload" ]); then
|
||||
if [ "${3}" != "ns" ]; then
|
||||
if [ "${3}" != "q" ]; then
|
||||
if [ "${SERVICE['service']}" = "nginx" ] && ([ "${SERVICE['node']}" == "" ] || [ "${SERVICE['node']}" == "all" ]); then
|
||||
if [ "${RUN_NODE_TYPE}" != "" ] && [ "${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}" != "" ] && ([ "${SERVICE['action']}" = "restart" ] || [ "${SERVICE['action']}" = "reload" ]); then
|
||||
if [ "${SERVICE['node']}" != "ns" ]; then
|
||||
if [ ${QUIET} -eq 0 ]; then
|
||||
echo -en "${idsCL[LightYellow]}Verifying replication across the nodes... ${idsCL[Default]}"
|
||||
fi
|
||||
if [[ "${RUN_NODE_IP}" == *"${!NT_HOST}"* ]]; then
|
||||
@@ -226,7 +281,7 @@ SERVICE(){
|
||||
PH_CMD="ssh root@${!NT_HOST}"
|
||||
fi
|
||||
${PH_CMD} touch ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl
|
||||
# ${PH_CMD} "echo -e \"Service ${1} ${2}\" >> ${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"
|
||||
for nip in "${!NT_HOSTS}"; do
|
||||
checkhost=$(CHECK_HOST ${nip})
|
||||
if [ "${checkhost}" != "false" ] && [ "${nip}" != "${!NT_HOST}" ]; then
|
||||
@@ -239,32 +294,30 @@ SERVICE(){
|
||||
${PH_CMD} rm -f ${NM_REPL_NGINX_PATHS[${RUN_NODE_TYPE}]}/test.repl
|
||||
fi
|
||||
fi
|
||||
elif ([ "${1}" = "pdns" ] || [ "${1}" = "pdnsadmin" ] || [ "${1}" = "headscale" ]) && ([ "${3}" == "" ] || [ "${3}" == "all" ]); then
|
||||
if [ "${2}" = "start" ] || [ "${2}" = "restart" ] || [ "${2}" = "reload" ]; then
|
||||
if [ "${3}" != "ns" ]; then
|
||||
if [ "${3}" != "q" ]; then
|
||||
echo -en "${idsCL[LightYellow]}Verifying replication across the nodes... ${idsCL[Default]}"
|
||||
fi
|
||||
elif ([ "${SERVICE['service']}" = "pdns" ] || [ "${SERVICE['service']}" = "pdnsadmin" ] || [ "${SERVICE['service']}" = "headscale" ]) && ([ "${SERVICE['node']}" == "" ] || [ "${SERVICE['node']}" == "all" ]); then
|
||||
if [ "${SERVICE['action']}" = "start" ] || [ "${SERVICE['action']}" = "restart" ] || [ "${SERVICE['action']}" = "reload" ]; then
|
||||
if [ "${SERVICE['node']}" != "ns" ]; then
|
||||
[ ${QUIET} -eq 0 ] && echo -en "${idsCL[LightYellow]}Verifying replication across the nodes... ${idsCL[Default]}"
|
||||
if [[ "${RUN_NODE_IP}" == *"${!NT_HOST}"* ]]; then
|
||||
PH_CMD=""
|
||||
else
|
||||
PH_CMD="ssh root@${!NT_HOST}"
|
||||
fi
|
||||
${PH_CMD} touch ${NM_REPL_CHECK_LOC[${1}]}/test.repl
|
||||
${PH_CMD} touch ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl
|
||||
for nip in "${!NT_HOSTS}"; do
|
||||
checkhost=$(CHECK_HOST ${nip})
|
||||
if [ "${checkhost}" != "false" ] && [ "${nip}" != "${!NT_HOST}" ]; then
|
||||
checked=false
|
||||
until [ "${checked}" = "true" ]; do
|
||||
checked="`${PH_CMD} ssh root@${nip} [ -f ${NM_REPL_CHECK_LOC[${1}]}/test.repl ] && [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_CHECK_LOC[${1}]}/test.repl)) -le 90 ] && echo true`"
|
||||
checked="`${PH_CMD} ssh root@${nip} [ -f ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl ] && [ $(expr $(date +%s) - $(stat -L --format %Y ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl)) -le 90 ] && echo true`"
|
||||
done
|
||||
fi
|
||||
done
|
||||
${PH_CMD} rm -f ${NM_REPL_CHECK_LOC[${1}]}/test.repl
|
||||
${PH_CMD} rm -f ${NM_REPL_CHECK_LOC[${SERVICE['service']}]}/test.repl
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if [ "${3}" != "q" ]; then
|
||||
if [ ${QUIET} -eq 0 ]; then
|
||||
echo -e "${idsCL[Green]}Completed${idsCL[Default]}"
|
||||
echo
|
||||
fi
|
||||
@@ -272,11 +325,11 @@ SERVICE(){
|
||||
if [[ "$(declare -p NTS)" =~ "declare -a" ]]; then
|
||||
for NTYPE in "${NTS[@]}"; do
|
||||
var1=${NTYPE}_SERVICES_CHECK[@]
|
||||
# if [[ "${!var1}" = *"${1}"* ]]; then
|
||||
if [[ " ${!var1} " =~ " ${1} " ]]; then
|
||||
# if [[ "${!var1}" = *"${SERVICE['service']}"* ]]; then
|
||||
if [[ " ${!var1} " =~ " ${SERVICE['service']} " ]]; then
|
||||
nid=1
|
||||
if [ "${3}" != "" ]; then
|
||||
var2=(${3})
|
||||
if [ "${SERVICE['node']}" != "" ]; then
|
||||
var2=(${SERVICE['node']})
|
||||
sethost=true;
|
||||
else
|
||||
var2=${NTYPE}_HOSTS[@]
|
||||
@@ -288,13 +341,13 @@ SERVICE(){
|
||||
|
||||
for nip in "${var2[@]}"; do
|
||||
echo "HERE: ${NTYPE} - ${nip}"
|
||||
# if [[ "${RUN_NODE_IP}" == *"${3}"* ]]; then GO=true;
|
||||
# elif [ ! -z ${3+x} ] || [ "${3}" == "q" ]; then GO=true;
|
||||
# if [[ "${RUN_NODE_IP}" == *"${SERVICE['node']}"* ]]; then GO=true;
|
||||
# elif [ ! -z ${SERVICE['node']+x} ] || [ "${SERVICE['node']}" == "q" ]; then GO=true;
|
||||
# else GO=false;
|
||||
# fi
|
||||
# if [ "${GO}" == "true" ]; then
|
||||
if [ $sethost == true ]; then
|
||||
nodename=${NM_HOSTNAMES[${3}]}
|
||||
nodename=${NM_HOSTNAMES[${SERVICE['node']}]}
|
||||
else
|
||||
nodename="${NM_HOSTNAMES[${nip}]}[${nip}]"
|
||||
fi
|
||||
@@ -306,25 +359,25 @@ SERVICE(){
|
||||
fi
|
||||
|
||||
NOGOCHK=true;
|
||||
if [ "${1}" == "gitea" ]; then
|
||||
if [ "${SERVICE['service']}" == "gitea" ]; then
|
||||
if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *$(GET_AUTHELIA_IP)* ]]; then
|
||||
NOGOCHK=false;
|
||||
fi
|
||||
elif [ "${1}" == "headscale" ]; then
|
||||
elif [ "${SERVICE['service']}" == "headscale" ]; then
|
||||
if [[ $(${NCMD} ip addr show $(ip route | awk '/default/ { print $5 }') | grep "inet" | awk '/inet/ {print $2}' | cut -d'/' -f1) != *${NM_SINGLESRVR_IP['HS']}* ]]; then
|
||||
NOGOCHK=false;
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${NOGOCHK}" == "true" ]; then
|
||||
if [ "${3}" != "q" ]; then
|
||||
echo -en "${NM_SRVCOPTS[${2}]}ing on ${nodename} ($nip)... ${idsCL[Default]}"
|
||||
if [ ${QUIET} -eq 0 ]; then
|
||||
echo -en "${NM_SRVCOPTS[${SERVICE['action']}]}ing on ${nodename} ($nip)... ${idsCL[Default]}"
|
||||
fi
|
||||
checkhost=$(CHECK_HOST ${nip})
|
||||
if [ "${checkhost}" != "false" ]; then
|
||||
|
||||
if [ "${1}"= = "offsite-power-check" ]; then
|
||||
if [ "${3}" != "q" ] && [ "${2}" != "status" ]; then
|
||||
if [ "${SERVICE['service']}"= = "offsite-power-check" ]; then
|
||||
if [ ${QUIET} -eq 0 ] && [ "${SERVICE['action']}" != "status" ]; then
|
||||
if [ "$(ssh 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
|
||||
@@ -332,20 +385,20 @@ SERVICE(){
|
||||
fi
|
||||
fi
|
||||
else
|
||||
[ "${1}" = "pdnsadmin" ] && srva="pdnsadmin.socket pdnsadmin.service" || srva=${1}
|
||||
if [ "${2}" != "status" ]; then
|
||||
${NCMD} systemctl ${2} ${srva} >/dev/null 2>&1
|
||||
[ "${SERVICE['service']}" = "pdnsadmin" ] && srva="pdnsadmin.socket pdnsadmin.service" || srva=${SERVICE['service']}
|
||||
if [ "${SERVICE['action']}" != "status" ]; then
|
||||
${NCMD} systemctl ${SERVICE['action']} ${srva} >/dev/null 2>&1
|
||||
else
|
||||
echo
|
||||
${NCMD} systemctl ${2} ${srva}
|
||||
${NCMD} systemctl ${SERVICE['action']} ${srva}
|
||||
echo
|
||||
fi
|
||||
if [ "${3}" != "q" ] && [ "${2}" != "status" ]; then
|
||||
if [[ "enable,disable" = *"${2}"* ]] || [ "${1}" = "daemon-reload" ]; then
|
||||
if [ ${QUIET} -eq 0 ] && [ "${SERVICE['action']}" != "status" ]; then
|
||||
if [[ "enable,disable" = *"${SERVICE['action']}"* ]] || [ "${SERVICE['service']}" = "daemon-reload" ]; then
|
||||
echo -e "${idsCL[Green]}Done${idsCL[Default]}"
|
||||
elif [ "$(${NCMD} systemctl is-active ${1})" = "active" ]; then
|
||||
elif [ "$(${NCMD} systemctl is-active ${SERVICE['service']})" = "active" ]; then
|
||||
echo -e "${idsCL[Green]}Done${idsCL[Default]}"
|
||||
elif [ "$2" = "stop" ]; then
|
||||
elif [ "${SERVICE['action']}" = "stop" ]; then
|
||||
echo -e "${idsCL[Red]}STOPPED${idsCL[Default]}"
|
||||
else
|
||||
echo -e "${idsCL[Red]}ERROR${idsCL[Default]}"
|
||||
@@ -353,13 +406,13 @@ SERVICE(){
|
||||
fi
|
||||
fi
|
||||
|
||||
elif [ "${3}" != "q" ]; then
|
||||
elif [ ${QUIET} -eq 0 ]; then
|
||||
echo -e "${idsCL[Red]}Node is Down${idsCL[Default]}"
|
||||
fi
|
||||
fi
|
||||
# fi
|
||||
nid=`expr $nid + 1`
|
||||
# if [ "${1}" = "gitea" ]; then
|
||||
# if [ "${SERVICE['service']}" = "gitea" ]; then
|
||||
# break
|
||||
# fi
|
||||
done
|
||||
@@ -367,20 +420,20 @@ SERVICE(){
|
||||
done
|
||||
|
||||
else #no-nodetypes, standalone setup
|
||||
echo -en "${NM_SRVCOPTS[${2}]}ing on localhost ... ${idsCL[Default]}"
|
||||
if [ "${2}" != "status" ]; then
|
||||
systemctl ${2} ${srva} >/dev/null 2>&1
|
||||
echo -en "${NM_SRVCOPTS[${SERVICE['action']}]}ing on localhost ... ${idsCL[Default]}"
|
||||
if [ "${SERVICE['action']}" != "status" ]; then
|
||||
systemctl ${SERVICE['action']} ${srva} >/dev/null 2>&1
|
||||
else
|
||||
echo
|
||||
systemctl ${2} ${srva}
|
||||
systemctl ${SERVICE['action']} ${srva}
|
||||
echo
|
||||
fi
|
||||
if [ "${3}" != "q" ] && [ "${2}" != "status" ]; then
|
||||
if [[ "enable,disable" = *"${2}"* ]] || [ "${1}" = "daemon-reload" ]; then
|
||||
if [ ${QUIET} -eq 0 ] && [ "${SERVICE['action']}" != "status" ]; then
|
||||
if [[ "enable,disable" = *"${SERVICE['action']}"* ]] || [ "${SERVICE['service']}" = "daemon-reload" ]; then
|
||||
echo -e "${idsCL[Green]}Done${idsCL[Default]}"
|
||||
elif [ "$(systemctl is-active ${1})" = "active" ]; then
|
||||
elif [ "$(systemctl is-active ${SERVICE['service']})" = "active" ]; then
|
||||
echo -e "${idsCL[Green]}Done${idsCL[Default]}"
|
||||
elif [ "$2" = "stop" ]; then
|
||||
elif [ "${SERVICE['action']}" = "stop" ]; then
|
||||
echo -e "${idsCL[Red]}STOPPED${idsCL[Default]}"
|
||||
else
|
||||
echo -e "${idsCL[Red]}ERROR${idsCL[Default]}"
|
||||
@@ -389,9 +442,9 @@ SERVICE(){
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "${3}" != "q" ]; then
|
||||
if [ ${QUIET} -eq 0 ]; then
|
||||
echo
|
||||
echo -e "${idsCL[Green]}${NM_SERVICE_DESC[${1}]} has been ${NM_SRVCOPTS[${2}]}ed${idsCL[Default]}"
|
||||
echo -e "${idsCL[Green]}${NM_SERVICE_DESC[${SERVICE['service']}]} has been ${NM_SRVCOPTS[${SERVICE['action']}]}ed${idsCL[Default]}"
|
||||
echo
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -55,7 +55,7 @@ DELSITE(){
|
||||
|
||||
[ "${NM_AUTHELIA_IP}" != "" ] && ssh root@${NM_AUTHELIA_IP} sed -i "/${DEL_SITE}/d" ${NM_DOCKER_COMPOSE_LOC['authelia']}/config/configuration.yml
|
||||
|
||||
SERVICE nginx restart
|
||||
SERVICE_MGMT nginx restart
|
||||
|
||||
echo -e "${idsCL[LightRed]}Site has been deleted.${idsCL[Default]}\n"
|
||||
else
|
||||
@@ -342,7 +342,7 @@ NEWSITE(){
|
||||
fi
|
||||
|
||||
# if [ "${CREATE_SSL}" = "yes" ]; then
|
||||
# [ -f ${NM_NGINXPATH}/sites-enabled/default* ] && SERVICE nginx restart >/dev/null 2>&1
|
||||
# [ -f ${NM_NGINXPATH}/sites-enabled/default* ] && SERVICE_MGMT nginx restart >/dev/null 2>&1
|
||||
# NEWCERT ${NEW_SITE} newsite ${CERTTEST}
|
||||
# fi
|
||||
|
||||
@@ -362,10 +362,10 @@ NEWSITE(){
|
||||
# if [[ ${NGINXRELOAD} =~ ^[Nn]$ ]]; then
|
||||
# echo
|
||||
# else
|
||||
# SERVICE nginx restart
|
||||
# SERVICE_MGMT nginx restart
|
||||
# fi
|
||||
# else
|
||||
# SERVICE nginx restart
|
||||
# SERVICE_MGMT nginx restart
|
||||
# fi
|
||||
else
|
||||
echo "Missing proxy arguments"
|
||||
|
||||
Reference in New Issue
Block a user