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

update

Browse Source
This commit is contained in:
David Schroeder
2025-05-26 12:09:19 -05:00
parent 27c6381ae9
commit f68848ebc1
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
defaults.inc
View File

@@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='5.5.1f-05262025' VERS='5.5.1-05262025'
NM_BETA=true NM_BETA=false
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 betacheck offsite-staticroute-fix ' 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 betacheck offsite-staticroute-fix '
CERT_DAEMON='/opt/certbot/bin/certbot' CERT_DAEMON='/opt/certbot/bin/certbot'

8
inc/certs.inc
View File

@@ -71,7 +71,7 @@ NEWCERT(){
echo echo
[ ${CERTTEST} -eq 1 ] && DRYRUN='--dry-run' || DRYRUN='' [ ${CERTTEST} -eq 1 ] && DRYRUN='--dry-run' || DRYRUN=''
${CERT_DAEMON} --authenticator dns-pdns --dns-pdns-credentials ${NM_FOLDER}/conf/pdns-credentials.ini certonly ${CERTEXPAND} ${DRYRUN} --key-type ${CERTENC} --server ${CERTSERVER} --preferred-chain "${CERTCHAIN}" -d ${NEW_CERT} ${CERT_DAEMON} --authenticator dns-pdns --dns-pdns-credentials ${NM_FOLDER}/conf/pdns-credentials.conf certonly ${CERTEXPAND} ${DRYRUN} --key-type ${CERTENC} --server ${CERTSERVER} --preferred-chain "${CERTCHAIN}" -d ${NEW_CERT}
chown -R root:le ${NM_CERTPATH} chown -R root:le ${NM_CERTPATH}
chmod -R 6775 ${NM_CERTPATH} chmod -R 6775 ${NM_CERTPATH}
@@ -155,7 +155,7 @@ CERTRENEW(){
mv -f ${NM_LOGFOLDER}/cert-renewal.lastrun ${NM_LOGFOLDER}/cert-renewal1.lastrun >/dev/null 2>&1 mv -f ${NM_LOGFOLDER}/cert-renewal.lastrun ${NM_LOGFOLDER}/cert-renewal1.lastrun >/dev/null 2>&1
# ${CERT_DAEMON} renew ${CERTAUTH} > ${NM_LOGFOLDER}/cert-renewal.lastrun # ${CERT_DAEMON} renew ${CERTAUTH} > ${NM_LOGFOLDER}/cert-renewal.lastrun
${CERT_DAEMON} --authenticator dns-pdns --dns-pdns-credentials ${NM_FOLDER}/conf/pdns-credentials.ini renew > ${NM_LOGFOLDER}/cert-renewal.lastrun ${CERT_DAEMON} --authenticator dns-pdns --dns-pdns-credentials ${NM_FOLDER}/conf/pdns-credentials.conf renew > ${NM_LOGFOLDER}/cert-renewal.lastrun
CONCAT_SSL CONCAT_SSL
@@ -166,7 +166,9 @@ CERTRENEW(){
echo -e "${daterun}" >> ${NM_LOGFOLDER}/cert-renewal.lastrun echo -e "${daterun}" >> ${NM_LOGFOLDER}/cert-renewal.lastrun
DIVIDER true DIVIDER true
echo echo
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 ${NMG_ACTION} ] || [ "${NMG_ACTION}" = "gui" ]; then if [ -z ${NMG_ACTION} ] || [ "${NMG_ACTION}" = "gui" ]; then
@@ -175,7 +177,7 @@ CERTRENEW(){
fi fi
} }
NIGHTLYRENEW(){ NIGHTLYRENEW(){
${CERT_DAEMON} --authenticator dns-pdns --dns-pdns-credentials ${NM_FOLDER}/conf/pdns-credentials.ini renew ${CERT_DAEMON} --authenticator dns-pdns --dns-pdns-credentials ${NM_FOLDER}/conf/pdns-credentials.conf renew
CONCAT_SSL CONCAT_SSL
chown -R root:le ${NM_CERTPATH} chown -R root:le ${NM_CERTPATH}
chmod -R 6775 ${NM_CERTPATH} chmod -R 6775 ${NM_CERTPATH}