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

update

Browse Source
This commit is contained in:
David Schroeder
2023-06-30 18:07:14 -05:00
parent 1a84ff25b8
commit 2af736529c
9 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
defaults.inc
View File

@@ -273,7 +273,7 @@ DISP_HEADER(){
if [ "$1" = true ]; then
clear
fi
echo ""
echo
echo -e "${idsCL[LightGreen]} NodeMgmt - Node Monitoring & Management${idsCL[Default]} ${idsCL[DarkGray]}(ver-${VERS})${idsCL[Default]}"
DIVIDER . lightGreen
if [ "$2" = true ]; then
@@ -311,7 +311,7 @@ DISP_HEADER(){
DIVIDER
fi
fi
echo ""
echo
}
CERT-CHECK(){

16
inc/certs.inc
View File

@@ -17,7 +17,7 @@ NEWCERT(){
fi
if [ "${NEW_CERT}" != "" ]; then
echo -e "${idsCL[LightGreen]}Requesting Certificate for '${idsCL[Yellow]}${NEW_CERT}${idsCL[LightGreen]}'...${idsCL[Default]}"
echo ""
echo
# echo -en "${idsCL[LightYellow]}Stopping other Webservers... ${idsCL[Default]}"
# for nip in "${WEB_HOSTS[@]}"; do
@@ -89,7 +89,7 @@ NEWCERT(){
# done
# echo -e "${idsCL[Green]}Completed${idsCL[Default]}"
echo ""
echo
if [ -z $action ] || [ "${action}" = "gui" ]; then
DIVIDER true
ENTER2CONTINUE
@@ -106,21 +106,21 @@ DEL-SSL(){
if [ -z ${1+x} ]; then
echo -e -n "${idsCL[LightCyan]}Delete what SSL site address: ${idsCL[Default]}"
read DEL_SSL
echo ""
echo
else
DEL_SSL=${1}
fi
if [ ! -z ${DEL_SSL+x} ] && [ "${DEL_SSL}" != "" ]; then
if [ -d /etc/letsencrypt/live/${DEL_SSL} ]; then
echo -e "${idsCL[LightRed]}Deleting the SSL certificates for '${idsCL[Red]}${DEL_SSL}${idsCL[LightRed]}'...${idsCL[Default]}"
echo ""
echo
echo -en "${idsCL[LightRed]}Removing Files and Folders... ${idsCL[Default]}"
rm -rf /etc/letsencrypt/archive/${DEL_SSL}
rm -rf /etc/letsencrypt/live/${DEL_SSL}
rm -f /etc/letsencrypt/renewal/${DEL_SSL}.conf
echo -e "${idsCL[Green]}OK${idsCL[Default]}"
echo ""
echo
else
@@ -160,7 +160,7 @@ CERTRENEW(){
echo
SERVICE nginx restart 2>&1 | tee -a ${FOLDER}/cert-renewal.lastrun
echo -e "${idsCL[LightGreen]}The certificates have been renewed.${idsCL[Default]}"
echo ""
echo
if [ -z $action ] || [ "${action}" = "gui" ]; then
DIVIDER true
ENTER2CONTINUE
@@ -266,7 +266,7 @@ LISTCERTS(){
DIVIDER true
ENTER2CONTINUE
fi
echo ""
echo
}
LISTCERTS_NPM(){
@@ -341,7 +341,7 @@ LISTCERTS_NPM(){
DIVIDER true
ENTER2CONTINUE
fi
echo ""
echo
}
COPYCERTS_NPM(){
ssldir='/opt/nginx-proxy/ssl'

24
inc/sites.inc
View File

@@ -8,7 +8,7 @@ DELSITE(){
-list) DELSITES; exit 0;;
-*)
echo "Invalid option: '${1}' requires an argument" 1>&2
echo ""
echo
echo -e "Usage: ${idsCL[Yellow]}nodemgmt delsite${idsCL[Default]} {"
width=33
printf "%-${width}s- %s\n" " -site {FQDN address}" "(*required)"
@@ -22,7 +22,7 @@ DELSITE(){
if [ -z ${DEL_SITE+x} ]; then
echo -e -n "${idsCL[LightCyan]}Delete what site address: ${idsCL[Default]}"
read DEL_SITE
echo ""
echo
fi
if [[ $DEL_SSL =~ ^[Nn]$ ]]; then
DEL_SSL=no
@@ -39,7 +39,7 @@ DELSITE(){
fi
if [ ! -z ${DEL_SITE+x} ] && [ "${DEL_SITE}" != "" ]; then
echo -e "${idsCL[LightRed]}Deleting site '${idsCL[Red]}${DEL_SITE^^}${idsCL[LightRed]}'...${idsCL[Default]}"
echo ""
echo
echo -e "${idsCL[LightRed]}[[Removing Files and Folders]]${idsCL[Default]}"
echo -e "${idsCL[LightRed]}-------------------------------------------${idsCL[Default]}"
@@ -90,12 +90,12 @@ DELSITE(){
# fi
# nid=`expr $nid + 1`
# done
# echo ""
# echo
# SERVICE nginx reload ns
echo -e "${idsCL[LightRed]}Site has been deleted.${idsCL[Default]}"
else
echo "Missing arguments"
echo ""
echo
echo -e "Usage: ${idsCL[Yellow]}nodemgmt delsite${idsCL[Default]} {"
width=33
printf "%-${width}s- %s\n" " -site {FQDN address}" "Site to delete"
@@ -125,15 +125,15 @@ DELSITES(){
for s in "${!SITES[@]}"; do
echo " [${s}] ${SITES[${s}]}"
done
echo ""
echo
if [ -z $action ] || [ "${action}" = "gui" ]; then
echo " [B] Back"
fi
echo " [Q] Quit"
echo ""
echo
echo -e -n "${idsCL[LightYellow]}Please select a site from above from above:${idsCL[Default]} "
read selsite
echo ""
echo
if [ -z ${SITES[$selsite]} ] && [ "${selsite}" != "Q" ] && [ "${selsite}" != "q" ] && [ "${selsite}" != "B" ] && [ "${selsite}" != "b" ]; then
echo "Thats an invaild option,"
echo "please select a valid option only."
@@ -149,12 +149,12 @@ DELSITES(){
do
echo -e -n "${idsCL[LightRed]}Are you sure you want to delete '${idsCL[Red]}${SITES[${selsite}]^^}${idsCL[LightRed]}'? [y/N]${idsCL[Default]} "
read response
echo ""
echo
if [[ $response =~ ^[Yy]$ ]]; then
echo -e -n "${idsCL[LightRed]}Do you also want to delete the certs for '${idsCL[Red]}${SITES[${selsite}]^^}${idsCL[LightRed]}', if they exist? [y/N]${idsCL[Default]} "
read sslresponse
DELSITE -site ${SITES[${selsite}]} -ssl ${sslresponse}
echo ""
echo
DIVIDER
ENTER2CONTINUE
break
@@ -185,7 +185,7 @@ NEWSITE(){
-exploits) EXPLOITS=${2};;
-secure) SECURE=${2};;
-h | -help | --help)
echo ""
echo
echo -e "Usage: ${idsCL[Yellow]}nodemgmt newcert${idsCL[Default]} {"
width=33
printf "%-${width}s- %s\n" " -site {FQDN address(,es)}" "(new site and aliases, comma separated)"
@@ -329,7 +329,7 @@ NEWSITE(){
fi
if [ "${GO}" = "true" ]; then
echo -e "${idsCL[LightGreen]}Setting up new site for '${idsCL[Yellow]}${MAIN_SITE}${idsCL[LightGreen]}' {${NGINX_SERVERNAME}}...${idsCL[Default]}"
echo ""
echo
[ "${WEBSOCKET}" == "yes" ] && WEBSOCKET="include conf.d\/include\/websocket-support.conf;" || WEBSOCKET=""
[ "${HSTS}" == "yes" ] && HSTS="include conf.d\/include\/hsts-support.conf;" || HSTS=""

2
inc/status.inc
View File

@@ -678,7 +678,7 @@ STATUS(){
########################
########################
if [ "${ST_ACTION}" != "check" ]; then
echo ""
echo
if [ -z $action ] || [ "${action}" = "gui" ]; then
DIVIDER true
ENTER2CONTINUE

10
install.sh
View File

@@ -5,7 +5,7 @@ source /dev/stdin <<< "$(curl -sL http://go.scity.us/colorsinc)"
source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)"
echo ""
echo
echo -e "${idsCL[LightGreen]}NodeMgmt Installation Script${idsCL[Default]}"
do_with_root $APTFUNC -y install wget curl git
@@ -33,11 +33,11 @@ echo -e "NODE_HOSTNAME=\"$(hostname)\"
" > /opt/idssys/nodemgmt/settings.conf
echo ""
echo
echo -e "${idsCL[Yellow]}NodeMgmt has been Installed${idsCL[Default]}"
echo ""
echo
echo -e "To run, use the command: ${idsCL[Green]}nodemgmt${idsCL[Default]}"
echo ""
echo ""
echo
echo
exit 0

62
nodemgmt-scripts.sh
View File

@@ -124,7 +124,7 @@ BACKUP(){
done
touch ${FOLDER}/backup.lastrun
# if [ "${action}" != "backup" ]; then
echo ""
echo
DIVIDER true
# fi
if [ -z $action ] || [ "${action}" = "gui" ]; then
@@ -226,7 +226,7 @@ SET-PERMISSIONS(){
${NCMD} chown -R root:letsencrypt /etc/letsencrypt
${NCMD} chmod -R 6775 /etc/letsencrypt
echo -e "${idsCL[Green]}Complete${idsCL[Default]}"
echo ""
echo
fi
nid=`expr $nid + 1`
done
@@ -270,12 +270,12 @@ SET-PERMISSIONS(){
${NCMD} chown -R www-data:www-data /opt/powerdns-admin
${NCMD} chmod -R 775 /opt/powerdns-admin
echo -e "${idsCL[Green]}Complete${idsCL[Default]}"
echo ""
echo
fi
fi
nid=`expr $nid + 1`
done
if [ "${NEW_SITE}" != "" ]; then echo ""; fi
if [ "${NEW_SITE}" != "" ]; then echo ; fi
if [ -z $action ] || [ "${action}" = "gui" ]; then
ENTER2CONTINUE
fi
@@ -285,7 +285,7 @@ SET-PERMISSIONS(){
SERVICES(){
while :
do
echo ""
echo
echo -e "${idsCL[Green]}Node Services${idsCL[Default]}"
DIVIDER true
s=1
@@ -294,16 +294,16 @@ SERVICES(){
echo " [${s}] ${NM_SERVICES[${srvc}]}"
s=`expr $s + 1`
done
echo ""
echo
if [ -z $action ] || [ "${action}" = "gui" ]; then
echo " [B] Back"
fi
echo " [Q] Quit"
echo ""
echo
echo -e -n "${idsCL[LightYellow]}Please select a service from above:${idsCL[Default]} "
read -n 1 selsrvc
selsrvc=`expr $selsrvc - 1`
echo ""
echo
if [ -z ${NODE_SERVICES[${selsrvc}]} ] && [ "${selsrvc}" != "Q" ] && [ "${selsrvc}" != "q" ] && [ "${selsrvc}" != "B" ] && [ "${selsrvc}" != "b" ]; then
echo "Thats an invaild option,"
echo "please select a valid option only."
@@ -315,7 +315,7 @@ SERVICES(){
elif [ "${selsrvc}" = "B" ] || [ "${selsrvc}" = "b" ]; then
GUI
else
echo ""
echo
echo -e "${idsCL[Green]}Node Service Selected: '${idsST[Bold]}${NM_SERVICES[${NODE_SERVICES[${selsrvc}]}]}${idsST[Reset]}${idsCL[Green]}'${idsCL[Default]}"
DIVIDER true
s=1
@@ -323,16 +323,16 @@ SERVICES(){
echo " [${s}] ${srvcopt~}"
s=`expr $s + 1`
done
echo ""
echo
if [ -z $action ] || [ "${action}" = "gui" ]; then
echo " [B] Back"
fi
echo " [Q] Quit"
echo ""
echo
echo -e -n "${idsCL[LightYellow]}Please select an action to run from above:${idsCL[Default]} "
read -n 1 selsrvcopt
selsrvcopt=`expr $selsrvcopt - 1`
echo ""
echo
if [ -z ${NM_SRVCOPT[${selsrvcopt}]} ] && [ "${selsrvcopt}" != "Q" ] && [ "${selsrvcopt}" != "q" ] && [ "${selsrvcopt}" != "B" ] && [ "${selsrvcopt}" != "b" ]; then
echo "Thats an invaild option,"
echo "please select a valid option only."
@@ -347,7 +347,7 @@ SERVICES(){
else
echo
SERVICE ${NODE_SERVICES[${selsrvc}]} ${NM_SRVCOPT[${selsrvcopt}]}
echo ""
echo
if [ -z $action ] || [ "${action}" = "gui" ]; then
DIVIDER
ENTER2CONTINUE
@@ -721,9 +721,9 @@ HAPROXY-CONFIG() {
done
fi
SERVICE haproxy reload
echo ""
echo
echo -e "${idsCL[Green]}HAProxy Config Files have been created.${idsCL[Default]}"
echo ""
echo
}
SINGLE_SERVER_SERVICE_CHECK(){
@@ -831,9 +831,9 @@ KEEPALIVE-CONFIG() {
done
fi
SERVICE keepalived reload
echo ""
echo
echo -e "${idsCL[Green]}Keepalive Config Files have been created.${idsCL[Default]}"
echo ""
echo
}
NODEUPDATE() {
@@ -981,9 +981,9 @@ ADD_LOGROTATE_CRONTAB(){
(crontab -l ; echo "0 */1 * * * logrotate -f ${FOLDER}/tmp-logrotate")| crontab -
fi
/bin/chmod 0644 ${FOLDER}/tmp-logrotate
echo ""
echo
echo -e "${idsCL[Green]}The crontab entry has been made${idsCL[Default]}"
echo ""
echo
read -n 1 -s -p "Press any key to continue"
echo
}
@@ -1031,9 +1031,9 @@ UPDATE_DYNDNS(){
else
[ "${2}" != 'q' ] && echo -e "${idsCL[Green]}${1^^} WAN IP has not changed '${OLDIP}' = '${NEWIP}'${idsCL[Default]}"
fi
echo
# if [ "${2}" != 'q' ]; then
# echo ""
# read -n 1 -s -p "Press any key to continue"
# echo
# fi
@@ -1128,7 +1128,7 @@ DOWNLIST(){
DIVIDER true
ENTER2CONTINUE
fi
echo ""
echo
}
UPDATEPUSHOVERINFO(){
@@ -1188,26 +1188,26 @@ GUI(){
do
echo " [1] Node Status"
echo " [2] Node Services"
echo ""
echo
echo " [3] New Site"
echo " [4] Delete Site"
echo ""
echo
echo " [5] New Certificate"
echo " [6] Renew Certificates"
echo " [7] List Certificates"
echo ""
echo
echo " [8] Set folder permissions on nodes"
echo " [9] Backup Node Settings and Files"
echo ""
echo
echo " [D] Update Primary DNS Records"
echo " [R] Add cron task to rotate wtmp & btmp log files"
echo ""
echo
echo " [Q] Quit"
echo ""
echo ""
echo
echo
echo -e -n "${idsCL[LightYellow]}Please select an [ActionItem] from above:${idsCL[Default]} "
read -n 1 opt
echo ""
echo
case $opt in
1) STATUS; GUI;;
2) SERVICES; GUI;;
@@ -1367,8 +1367,8 @@ GUI(){
echo -e " ${idsCL[Yellow]}update-dyndns${idsCL[Default]} - Update DYNDNS records"
echo -e " ${idsCL[Yellow]}vc-ssl${idsCL[Default]} - Update vCenter SSL"
echo -e "}"
echo ""
echo ""
echo
echo
exit 0;;
esac
# else

2
run.sh
View File

@@ -19,7 +19,7 @@ if [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]] && [ "
if curl -m 5 -s --head --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; then
if [ "${2}" != "q" ]; then
echo -en "${idsCL[LightCyan]}Checking for updates...${idsCL[Default]}"
echo ""
echo
fi
cd /opt/idssys/defaults
if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then

6
ssl-cert-check/ssl-cert-check
View File

@@ -573,7 +573,7 @@ usage()
{
echo "Usage: $0 [ -e email address ] [-E sender email address] [ -x days ] [-q] [-a] [-b] [-h] [-i] [-n] [-N] [-v]"
echo " { [ -s common_name ] && [ -p port] } || { [ -f cert_file ] } || { [ -c cert file ] } || { [ -d cert dir ] }"
echo ""
echo
echo " -a : Send a warning message through E-mail"
echo " -b : Will not print header"
echo " -c cert file : Print the expiration date for the PEM or PKCS12 formatted certificate in cert file"
@@ -593,7 +593,7 @@ usage()
echo " -v : Specify a specific protocol version to use (tls, ssl2, ssl3)"
echo " -V : Only print validation data"
echo " -x days : Certificate expiration interval (eg. if cert_date < days)"
echo ""
echo
}
@@ -639,7 +639,7 @@ check_server_status() {
TLSFLAG="${TLSFLAG} -servername $1"
fi
echo "" | ${OPENSSL} s_client -crlf ${VER} -connect ${1}:${2} ${TLSFLAG} 2> ${ERROR_TMP} 1> ${CERT_TMP}
echo | ${OPENSSL} s_client -crlf ${VER} -connect ${1}:${2} ${TLSFLAG} 2> ${ERROR_TMP} 1> ${CERT_TMP}
if ${GREP} -i "Connection refused" ${ERROR_TMP} > /dev/null
then

6
uninstall.sh
View File

@@ -8,7 +8,7 @@ source /dev/stdin <<< "$(curl -sL http://go.scity.us/defaultinc)"
if [ "$EUID" -ne 0 ]; then APTFUNC="sudo ${ATYPE}"
else APTFUNC="${ATYPE}"
fi
echo ""
echo
echo -e "${idsCL[LightGreen]}NodeMgmt Removal Script${idsCL[Default]}"
@@ -21,8 +21,8 @@ if [ "$IDSSYSF" = 2 ]; then
rm -Rf /opt/idssys/defaults
fi
echo ""
echo
echo -e "${idsCL[LightRed]}NodeMgmt has been Removed${idsCL[Default]}"
echo ""
echo
exit 0