This commit is contained in:
2023-12-05 23:11:36 -06:00
parent 08212ce67f
commit fdbf2f3eff
5 changed files with 4 additions and 37 deletions

View File

@@ -56,7 +56,6 @@ BACKUP(){
SET-PERMISSIONS(){
if [ "${1}" = "gitea" ]; then
nid=1
for nip in "${NM_HOSTS['WEB'][@]}"; do
if [[ ${RUN_NODE_IP} == *"${nip}"* ]]; then
NCMD=''
@@ -78,10 +77,8 @@ SET-PERMISSIONS(){
elif [ "${2}" != "q" ]; then
echo -e "${idsCL[Red]}Node is down${idsCL[Default]}"
fi
nid=`expr $nid + 1`
done
elif [ "${1}" = "pdnsadmin" ]; then
nid=1
for nip in "${NM_HOSTS['WEB'][@]}"; do
if [[ ${RUN_NODE_IP} == *"${nip}"* ]]; then
NCMD=''
@@ -101,7 +98,6 @@ SET-PERMISSIONS(){
elif [ "${2}" != "q" ]; then
echo -e "${idsCL[Red]}Node is down${idsCL[Default]}"
fi
nid=`expr $nid + 1`
done
elif [ "${1}" = "nextcloud" ]; then
nip=${NC_HOSTS[0]}
@@ -131,7 +127,6 @@ SET-PERMISSIONS(){
echo -e "${idsCL[Yellow]}Setting new site folder permissions for (${NM_WWWPATH}/${NEW_SITE})${idsCL[Default]}"
fi
if [ "${NEW_SITE}" = "xxx" ]; then
nid=1
for nip in "${MYSQL_HOSTS[@]}"; do
checkhost=$(CHECK_HOST ${nip})
if [ "${checkhost}" != "false" ]; then
@@ -148,10 +143,8 @@ SET-PERMISSIONS(){
echo -e "${idsCL[Green]}Complete${idsCL[Default]}"
echo
fi
nid=`expr $nid + 1`
done
fi
nid=1
[ "${NM_WWWPATHS['WEB']}" != "" ] && WWWPATH=${NM_WWWPATHS['WEB']} || WWWPATH=/var/www
for nip in "${NM_HOSTS['WEB'][@]}"; do
checkhost=$(CHECK_HOST ${nip})
@@ -186,7 +179,6 @@ SET-PERMISSIONS(){
echo
fi
fi
nid=`expr $nid + 1`
done
if [ "${NEW_SITE}" != "" ]; then echo ; fi
if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then
@@ -200,7 +192,6 @@ HAPROXY-CONFIG() {
DIVIDER false yellow
# if [[ "${MYSQLSERVICES_CHECK}" = *"haproxy"* ]]; then
if [[ " ${MYSQL_SERVICES_CHECK[*]} " =~ " haproxy " ]]; then
nid=1
for nip in "${MYSQL_HOSTS[@]}"; do
if [[ ${RUN_NODE_IP} == *"${nip}"* ]]; then
nip='localhost '
@@ -215,13 +206,11 @@ HAPROXY-CONFIG() {
${NCMD} "sed -e 's;%NIP%;${nip};g' ${NM_FOLDER}/templates/haproxy.config > /etc/haproxy/haproxy.cfg"
echo -e "${idsCL[Green]}COMPLETE${idsCL[Default]}"
nid=`expr $nid + 1`
done
echo
fi
# if [[ "${WEBSERVICES_CHECK}" = *"haproxy"* ]]; then
if [[ " ${WEB_SERVICES_CHECK[*]} " =~ " haproxy " ]]; then
nid=1
for nip in "${NM_HOSTS['WEB'][@]}"; do
if [[ ${RUN_NODE_IP} == *"${nip}"* ]]; then
nip='localhost '
@@ -236,12 +225,10 @@ HAPROXY-CONFIG() {
${NCMD} "sed -e 's;%NIP%;${nip};g' ${NM_FOLDER}/templates/haproxy.config > /etc/haproxy/haproxy.cfg"
echo -e "${idsCL[Green]}COMPLETE${idsCL[Default]}"
nid=`expr $nid + 1`
done
fi
# if [[ "${LBSERVICES_CHECK}" = *"haproxy"* ]]; then
if [[ " ${LB_SERVICES_CHECK[*]} " =~ " haproxy " ]]; then
nid=1
for nip in "${LB_HOSTS[@]}"; do
if [[ ${RUN_NODE_IP} == *"${nip}"* ]]; then
nip='localhost '
@@ -256,7 +243,6 @@ HAPROXY-CONFIG() {
${NCMD} "sed -e 's;%NIP%;${nip};g' ${NM_FOLDER}/templates/haproxy.config > /etc/haproxy/haproxy.cfg"
echo -e "${idsCL[Green]}COMPLETE${idsCL[Default]}"
nid=`expr $nid + 1`
done
fi
SERVICE_MGMT haproxy reload
@@ -271,7 +257,6 @@ KEEPALIVE-CONFIG() {
DIVIDER false yellow
# if [[ "${MYSQLSERVICES_CHECK}" = *"keepalive"* ]]; then
if [[ " ${MYSQL_SERVICES_CHECK[*]} " =~ " keepalived " ]]; then
nid=1
for nip in "${MYSQL_HOSTS[@]}"; do
if [[ ${RUN_NODE_IP} == *"${nip}"* ]]; then
nip='localhost '
@@ -286,13 +271,11 @@ KEEPALIVE-CONFIG() {
${NCMD} "sed -e 's;%NIP%;${nip};g' ${NM_FOLDER}/templates/keepalived.config > /etc/keepalived/keepalived.conf"
echo -e "${idsCL[Green]}COMPLETE${idsCL[Default]}"
nid=`expr $nid + 1`
done
echo
fi
# if [[ "${WEBSERVICES_CHECK}" = *"keepalive"* ]]; then
if [[ " ${WEB_SERVICES_CHECK[*]} " =~ " keepalived " ]]; then
nid=1
for nip in "${NM_HOSTS['WEB'][@]}"; do
if [[ ${RUN_NODE_IP} == *"${nip}"* ]]; then
nip='localhost '
@@ -307,7 +290,6 @@ KEEPALIVE-CONFIG() {
${NCMD} "sed -e 's;%NIP%;${nip};g' ${NM_FOLDER}/templates/keepalived.config > /etc/keepalived/keepalived.conf"
echo -e "${idsCL[Green]}COMPLETE${idsCL[Default]}"
nid=`expr $nid + 1`
done
fi
SERVICE_MGMT keepalived reload
@@ -589,7 +571,6 @@ RUN_COMMAND(){
echo -e "${idsST[Bold]}"; DIVIDER
echo -e "${idsCL[Yellow]} ${NM_NODETYPES[$NTYPE]}-Nodes to run command { \`${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14}\` }${idsCL[Default]}"
DIVIDER; echo -e "${idsST[Reset]}"
nid=1
var=${NTYPE}_HOSTS[@]
for nip in "${!var}"; do
@@ -602,7 +583,6 @@ RUN_COMMAND(){
${NCMD} ${1} ${2} ${3} ${4} ${5} ${6} ${7} ${8} ${9} ${10} ${11} ${12} ${13} ${14}
DIVIDER false green
echo
nid=`expr $nid + 1`
done
echo
done