diff --git a/defaults.inc b/defaults.inc index ae020db6..f0a54fae 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,7 +1,7 @@ #!/usr/bin/env bash -VERS='5.5.1f-05262025' -NM_BETA=true +VERS='5.5.1-05262025' +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 ' CERT_DAEMON='/opt/certbot/bin/certbot' diff --git a/inc/certs.inc b/inc/certs.inc index f17d684e..66917541 100755 --- a/inc/certs.inc +++ b/inc/certs.inc @@ -71,7 +71,7 @@ NEWCERT(){ echo [ ${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} 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 # ${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 @@ -166,7 +166,9 @@ CERTRENEW(){ echo -e "${daterun}" >> ${NM_LOGFOLDER}/cert-renewal.lastrun DIVIDER true echo + SERVICE_MGMT nginx reload >> ${NM_LOGFOLDER}/cert-renewal.lastrun + echo -e "${idsCL[LightGreen]}The certificates have been renewed.${idsCL[Default]}" echo if [ -z ${NMG_ACTION} ] || [ "${NMG_ACTION}" = "gui" ]; then @@ -175,7 +177,7 @@ CERTRENEW(){ fi } 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 chown -R root:le ${NM_CERTPATH} chmod -R 6775 ${NM_CERTPATH}