This commit is contained in:
2019-02-27 01:11:41 -06:00
parent 9c261f7d8a
commit a9c9c31efd
2 changed files with 10 additions and 129 deletions

View File

@@ -68,6 +68,13 @@ REPL_DESC['www']='Webserver Files'
REPL_DESC['git']='Gitea System'
REPL_DESC['gitssh']='Gitea SSH Keys'
declare -A BACKUP_ITEMS
BACKUP_ITEMS[nginx-settings]=/etc/nginx
BACKUP_ITEMS[letsencrypt-certs]=/etc/letsencrypt
BACKUP_ITEMS[gitea]=/var/lib/gitea
BACKUP_ITEMS[nginx-logs]='/var/www/!NGINX-Logs'
#BACKUP_ITEMS[webserver-files]=/var/www
GET-CHECKCERT-DOMAINS(){
declare -A CHECKCERT_DOMAINS
IFS=$'\n'

View File

@@ -464,126 +464,6 @@ STATUS(){
echo "runtime: ${runtime}"
}
# STATUS-CHECK(){
# start=`date +%s`
# if [ "${STATUS_CHECK_EMAIL}" != "" ]; then
# if [ ! -z ${LOCAL_SERVICES+x} ]; then NHCMD="ssh root@${NODE_HOSTS[0]}"
# else NHCMD=''; fi
# # for rcheck in "${REPL_CHECK[@]}"; do
# # ${NHCMD} rm -f ${FOLDER}/test.repl
# # daterun=`date +%Y-%m-%d-%H-%M-%S`
# # if [ "${NHCMD}" = "" ]; then
# # echo -e "iDS-MySQL${nid} (${nip})\n${daterun}" > ${FOLDER}/test.repl
# # yes | cp -rfH ${FOLDER}/test.repl ${REPL_CHECKS[${rcheck}]}/test.repl
# # else
# # ${NHCMD} "echo -e \"Status-Check (${NODE_HOSTNAME})\n${daterun}\" > ${FOLDER}/test.repl"
# # yes | ${NHCMD} "cp -rfH ${FOLDER}/test.repl ${REPL_CHECKS[${rcheck}]}/test.repl"
# # fi
# # done
# if [ ! -z ${LOCAL_SERVICES+x} ]; then
# lip=$(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1)
# for srvc in "${LOCAL_SERVICES[@]}"; do
# if [ "$(systemctl is-active ${srvc})" != "active" ]; then
# if [ ! -f ${FOLDER}/localhost-${srvc}.down ]; then
# echo "${NM_SERVICES[${srvc}]} is down" | mail -s "${NODE_HOSTNAME}-${nip}" ${STATUS_CHECK_EMAIL}
# touch ${FOLDER}/localhost-${srvc}.down
# fi
# elif [ -f ${FOLDER}/localhost-${srvc}.down ]; then
# echo "${NM_SERVICES[${srvc}]} is back UP!" | mail -s "${NODE_HOSTNAME}-${nip}" ${STATUS_CHECK_EMAIL}
# rm -f ${FOLDER}/localhost-${srvc}.down
# rm -f ${FOLDER}/localhost-${srvc}.errtime
# fi
# done
# fi
# if [ -z ${LOCAL_SERVICES+x} ] || [ "${1}" = "all" ]; then
# nid=1
# for nip in "${NODE_HOSTS[@]}"; do
# checkhost=$(CHECK_HOST ${nip})
# if [ "${checkhost}" != "false" ]; then
# if [ -f ${FOLDER}/${nip}.down ]; then
# rm -f ${FOLDER}/${nip}.down
# echo "iDS-MySQL${nid} is back UP!" | mail -s "iDS-MySQL${nid}-${nip}-UP" ${STATUS_CHECK_EMAIL}
# fi
# if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then NCMD=''
# else NCMD="ssh root@${nip}"
# fi
# for srvc in "${NODE_SERVICES_CHECK[@]}"; do
# if [ "$(${NCMD} systemctl is-active ${srvc})" != "active" ]; then
# if [ ! -f ${FOLDER}/${nip}-${srvc}.down ]; then
# echo "${NM_SERVICES[${srvc}]} is down" | mail -s "iDS-MySQL${nid}-${nip}" ${STATUS_CHECK_EMAIL}
# touch ${FOLDER}/${nip}-${srvc}.down
# else
# errtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}-${srvc}.down)
# if [ $errtime -gt ${RENOTIFY} ]; then
# if [ ! -f ${FOLDER}/${nip}-${srvc}.errtime ]; then
# mv ${FOLDER}/${nip}-${srvc}.down ${FOLDER}/${nip}-${srvc}.errtime
# fi
# toterrtime=`date +%s`-$(stat -c %Y ${FOLDER}/${nip}-${srvc}.errtime)
# echo "${NM_SERVICES[${srvc}]} has been down for $(SHOW_TIME ${toterrtime})" | mail -s "iDS-MySQL${nid}-${nip}" ${STATUS_CHECK_EMAIL}
# touch ${FOLDER}/${nip}-${srvc}.down
# fi
# fi
# elif [ -f ${FOLDER}/${nip}-${srvc}.down ]; then
# echo "${NM_SERVICES[${srvc}]} is back UP!" | mail -s "iDS-MySQL${nid}-${nip}" ${STATUS_CHECK_EMAIL}
# rm -f ${FOLDER}/${nip}-${srvc}.down
# rm -f ${FOLDER}/${nip}-${srvc}.errtime
# fi
# done
# elif [ ! -f ${FOLDER}/${nip}.down ]; then
# touch ${FOLDER}/${nip}.down
# echo "iDS-MySQL${nid} is down" | mail -s "iDS-MySQL${nid}-${nip}-DOWN" ${STATUS_CHECK_EMAIL}
# fi
# nid=`expr $nid + 1`
# done
# ##REPLICATION CHECK
# # nid=1
# # for nip in "${NODE_HOSTS[@]}"; do
# # if [ "${nip}" = "${NODE_HOSTS[0]}" ] && [ ! -z ${LOCAL_SERVICES+x} ]; then isreplhost=true; else isreplhost=false; fi
# # if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) != *"${nip}"* ]] && [ "${isreplhost}" = "false" ]; then
# # checkhost=$(CHECK_HOST ${nip})
# # if [ "${checkhost}" != "false" ]; then
# # if [ -f ${FOLDER}/${nip}.down ]; then
# # rm -f ${FOLDER}/${nip}.down
# # echo "iDS-MySQL${nid} is back UP!" | mail -s "iDS-MySQL${nid}-${nip}-UP" ${STATUS_CHECK_EMAIL}
# # fi
# # for rcheck in "${REPL_CHECK[@]}"; do
# # timeout=`date --date='20 seconds' +%s`
# # checked=false
# # until [ "${checked}" = "" ]; do
# # if [ "${NHCMD}" = "" ]; then
# # checked=`ssh root@${nip} "cat ${REPL_CHECKS[${rcheck}]}/test.repl" | diff - ${REPL_CHECKS[${rcheck}]}/test.repl`
# # else
# # checked="`${NHCMD} \"ssh root@${nip} \"cat ${REPL_CHECKS[${rcheck}]}/test.repl\" | diff - ${REPL_CHECKS[${rcheck}]}/test.repl\"`"
# # fi
# # if [ "`date +%s`" -gt "$timeout" ]; then
# # timeout=true
# # break
# # fi
# # done
# # if [ "${timeout}" != "true" ]; then
# # if [ -f ${FOLDER}/${nip}-${rcheck}.down ]; then
# # rm -f ${FOLDER}/${nip}-${rcheck}.down
# # echo "Replicated folder is back up!\n${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})" | mail -s "Repl-Timeout-'iDS-MySQL${nid}'" ${STATUS_CHECK_EMAIL}
# # fi
# # elif [ ! -f ${FOLDER}/${nip}-${rcheck}.down ]; then
# # touch ${FOLDER}/${nip}-${rcheck}.down
# # echo "${REPL_DESC[${rcheck}]} (${REPL_CHECKS[${rcheck}]})" | mail -s "Repl-Timeout-'iDS-MySQL${nid}'" ${STATUS_CHECK_EMAIL}
# # fi
# # done
# # elif [ ! -f ${FOLDER}/${nip}.down ]; then
# # touch ${FOLDER}/${nip}.down
# # echo "iDS-MySQL${nid} is down" | mail -s "iDS-MySQL${nid}-${nip}-DOWN" ${STATUS_CHECK_EMAIL}
# # fi
# # fi
# # nid=`expr $nid + 1`
# # done
# fi
# fi
# end=`date +%s`
# runtime=$((end-start))
# echo "runtime: ${runtime}"
# }
NEWCERT(){
echo ""
if [ -z ${1+x} ]; then
@@ -695,7 +575,7 @@ DEL-SSL(){
timeout=`date --date='2 minutes' +%s`
until [ "${checked}" = "" ]; do
tchecked=''
for nip in "${NODE_HOSTS[@]}"; do
for nip in "${WEB_HOSTS[@]}"; do
if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then NCMD=''
else NCMD="ssh root@${nip}"
fi
@@ -893,12 +773,6 @@ BACKUP(){
if [ ! -d ${BACKUP_FOLDER} ]; then
mkdir -p ${BACKUP_FOLDER}
fi
declare -A BACKUP_ITEMS
BACKUP_ITEMS[nginx-settings]=/etc/nginx
BACKUP_ITEMS[letsencrypt-certs]=/etc/letsencrypt
BACKUP_ITEMS[gitea]=/var/lib/gitea
BACKUP_ITEMS[nginx-logs]='/var/www/!NGINX-Logs'
#BACKUP_ITEMS[webserver-files]=/var/www
for item in "${!BACKUP_ITEMS[@]}"
do
if [ "${action}" != "backup" ]; then
@@ -960,7 +834,7 @@ DELSITE(){
echo -e "${idsCL[LightRed]}-------------------------------------------${idsCL[Default]}"
nid=1
for nip in "${NODE_HOSTS[@]}"
for nip in "${WEB_HOSTS[@]}"
do
if [[ $(/sbin/ip -o -4 addr list ens192 | awk '{print $4}' | cut -d/ -f1) == *"${nip}"* ]]; then
nip='localhost '
@@ -968,7 +842,7 @@ DELSITE(){
else
NCMD="ssh root@${nip}"
fi
echo -en "Removing from iDS-MySQL${nid} ($nip)... ${idsCL[Default]}"
echo -en "Removing from iDS-Webserver${nid} ($nip)... ${idsCL[Default]}"
#if [ -f /etc/nginx/sites-available/${DEL_SITE} ]; then
${NCMD} rm -f /etc/nginx/sites-available/${DEL_SITE}
${NCMD} rm -f /etc/nginx/sites-enabled/${DEL_SITE}