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

update

Browse Source
This commit is contained in:
David Schroeder
2023-11-13 19:49:38 -06:00
parent cdab063893
commit b2928ec917
3 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='4.13.29-11132023' VERS='4.13.30-11132023'
noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update ' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update '
CERT_DAEMON='/snap/bin/certbot' CERT_DAEMON='/snap/bin/certbot'

2
inc/certs.inc
View File

@@ -362,8 +362,6 @@ LISTCERTS(){
*) [ "${delconfirm}" !="" ] echo ;; *) [ "${delconfirm}" !="" ] echo ;;
esac esac
echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A" echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A"
[ "${SEARCH}" != "0" ] && LISTCERTS -edit -search ${SEARCH} || LISTCERTS -edit
exit 0
;; ;;
[Ee]) [Ee])
echo -e "\033[K" echo -e "\033[K"

30
inc/sites.inc
View File

@@ -837,7 +837,7 @@ SITEINFO(){
echo -e "\033[K" echo -e "\033[K"
echo -e "\033[K" echo -e "\033[K"
echo -e "\033[K" echo -e "\033[K"
echo -e "\033[K (${idsCL[Green]}S${idsCL[Default]})ave, (${idsCL[Yellow]}C${idsCL[Default]})ancel, (${idsCL[Yellow]}E${idsCL[Default]})xit" echo -e "\033[K (${idsCL[Green]}S${idsCL[Default]})ave Site, (${idsCL[Red]}D${idsCL[Default]})elete Site, (${idsCL[Yellow]}C${idsCL[Default]})ancel, (${idsCL[Yellow]}E${idsCL[Default]})xit"
echo -e "\033[K" echo -e "\033[K"
echo -e "\033[K" echo -e "\033[K"
echo -e "\033[7A" echo -e "\033[7A"
@@ -876,16 +876,34 @@ SITEINFO(){
read -i "${port}" -e port read -i "${port}" -e port
echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A" echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A"
;; ;;
[Ee])
echo -e "\033[K"
exit 0
;;
[Cc]) [Cc])
echo -e "\r\033[K\n\r\033[K\n\r\033[K" echo -e "\r\033[K\n\r\033[K\n\r\033[K"
echo -e "\033[16A"; for (( c=1; c<=16; c++ )); do echo -e "\r\033[K"; done; echo -e "\033[16A" echo -e "\033[16A"; for (( c=1; c<=16; c++ )); do echo -e "\r\033[K"; done; echo -e "\033[16A"
echo -e "\n\n\n\n\n\n\n\n" echo -e "\n\n\n\n\n\n\n\n"
;; ;;
[Dd])
echo -e "\033[K\n\033[K"
echo -en "\033[K${idsCL[LightCyan]}Are you sure you wish to delete the site and associated SSL if applicable (y/N): ${idsCL[Default]}"
read -n 1 delconfirm
case "${delconfirm}" in
[Yy])
echo -en "\n\n${idsCL[LightCyan]}Removing site ... "
# DELSITE -site ${site} -ssl yes >/dev/null 2>&1
echo -e "${idsCL[LightGreen]}Done\n${idsCL[Default]}"
[ "${SEARCH}" != "0" ] && SITEINFO -edit -search ${SEARCH} || SITEINFO -edit
exit 0
;;
*) [ "${delconfirm}" != "" ] echo ;;
esac
echo -e "\033[5A"; for (( c=1; c<=5; c++ )); do echo -e "\033[K"; done; echo -e "\033[5A"
;;
[Ee])
echo -e "\033[K"
exit 0
;;
*) ;; *) ;;
esac esac
[ "${editc}" == "" ] && echo -e "\033[13A" || echo -e "\033[12A" [ "${editc}" == "" ] && echo -e "\033[13A" || echo -e "\033[12A"