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-25 14:10:04 -06:00
parent 2e1edfe8a0
commit 5b1133a18e
3 changed files with 10 additions and 10 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.15.25-11232023' VERS='4.15.26-11232023'
noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log ' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log '
CERT_DAEMON='/snap/bin/certbot' CERT_DAEMON='/snap/bin/certbot'

16
inc/certs.inc
View File

@@ -86,7 +86,7 @@ NEWCERT(){
fi fi
echo echo
if [ -z $action ] || [ "${action}" = "gui" ]; then if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then
DIVIDER true DIVIDER true
ENTER2CONTINUE ENTER2CONTINUE
fi fi
@@ -145,7 +145,7 @@ CERTRENEW(){
SERVICE_MGMT 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 -e "${idsCL[LightGreen]}The certificates have been renewed.${idsCL[Default]}"
echo echo
if [ -z $action ] || [ "${action}" = "gui" ]; then if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then
DIVIDER true DIVIDER true
ENTER2CONTINUE ENTER2CONTINUE
fi fi
@@ -205,7 +205,7 @@ LISTCERTS(){
rm -f /tmp/ssllist rm -f /tmp/ssllist
# #for certdir in ${NM_CERTPATH}/live/*/ ; do echo $certdir; done > /tmp/ssllist # #for certdir in ${NM_CERTPATH}/live/*/ ; do echo $certdir; done > /tmp/ssllist
# fi # fi
if [ -z $action ] || [ "${action}" = "gui" ]; then if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then
DIVIDER true DIVIDER true
fi fi
echo -e "\033[K${idsCL[LightGreen]}Current Certificates on Node...${idsCL[Default]}" echo -e "\033[K${idsCL[LightGreen]}Current Certificates on Node...${idsCL[Default]}"
@@ -441,7 +441,7 @@ LISTCERTS(){
echo echo
if [ -z $action ] || [ "${action}" = "gui" ]; then if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then
DIVIDER true DIVIDER true
ENTER2CONTINUE ENTER2CONTINUE
fi fi
@@ -468,7 +468,7 @@ LISTCERTS_NPM(){
rm -f /tmp/ssllist rm -f /tmp/ssllist
for certdir in ${NM_CERTPATH}/live/*/ ; do echo $certdir; done > /tmp/ssllist for certdir in ${NM_CERTPATH}/live/*/ ; do echo $certdir; done > /tmp/ssllist
fi fi
if [ -z $action ] || [ "${action}" = "gui" ]; then if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then
DIVIDER true DIVIDER true
fi fi
echo echo
@@ -516,7 +516,7 @@ LISTCERTS_NPM(){
DIVIDER false darkGray 120 DIVIDER false darkGray 120
done done
echo echo
if [ -z $action ] || [ "${action}" = "gui" ]; then if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then
DIVIDER true DIVIDER true
ENTER2CONTINUE ENTER2CONTINUE
fi fi
@@ -539,7 +539,7 @@ COPYCERTS_NPM(){
done done
fi fi
if [ -z $action ] || [ "${action}" = "gui" ]; then if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then
DIVIDER true DIVIDER true
fi fi
@@ -552,7 +552,7 @@ COPYCERTS_NPM(){
fi fi
done done
if [ -z $action ] || [ "${action}" = "gui" ]; then if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then
echo echo
DIVIDER true DIVIDER true
ENTER2CONTINUE ENTER2CONTINUE

2
inc/status.inc
View File

@@ -739,7 +739,7 @@ It was down for $(SHOW_TIME ${toterrtime})"
######################## ########################
if [ "${ST_ACTION}" != "check" ]; then if [ "${ST_ACTION}" != "check" ]; then
echo echo
if [ -z $action ] || [ "${action}" = "gui" ]; then if [ -z ${ACTION} ] || [ "${ACTION}" = "gui" ]; then
DIVIDER true DIVIDER true
ENTER2CONTINUE ENTER2CONTINUE
fi fi