diff --git a/defaults.inc b/defaults.inc index eee55113..8cd87fda 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,7 +1,7 @@ #!/usr/bin/env bash -VERS='5.4.22-05172025' -NM_BETA=false +VERS='5.5.1a-05262025' +NM_BETA=true 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='/snap/bin/certbot' diff --git a/inc/certs.inc b/inc/certs.inc index 456c953b..8dbe8a7c 100755 --- a/inc/certs.inc +++ b/inc/certs.inc @@ -71,7 +71,7 @@ NEWCERT(){ echo [ ${CERTTEST} -eq 1 ] && DRYRUN='--dry-run' || DRYRUN='' - ${CERT_DAEMON} certonly ${CERTEXPAND} ${DRYRUN} --key-type ${CERTENC} --server ${CERTSERVER} --preferred-chain "${CERTCHAIN}" ${CERTAUTH} -d ${NEW_CERT} + ${CERT_DAEMON} --authenticator certbot-dns-powerdns:dns-powerdns --certbot-dns-powerdns:dns-powerdns-credentials ${NM_FOLDER}/conf/pdns-credentials.ini certonly ${CERTEXPAND} ${DRYRUN} --key-type ${CERTENC} --server ${CERTSERVER} --preferred-chain "${CERTCHAIN}" ${CERTAUTH} -d ${NEW_CERT} chown -R root:le ${NM_CERTPATH} chmod -R 6775 ${NM_CERTPATH} @@ -153,10 +153,15 @@ CERTRENEW(){ sleep 5 mv -f ${NM_LOGFOLDER}/cert-renewal1.lastrun ${NM_LOGFOLDER}/cert-renewal2.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 certbot-dns-powerdns:dns-powerdns --certbot-dns-powerdns:dns-powerdns-credentials ${NM_FOLDER}/conf/pdns-credentials.ini renew ${CERTAUTH} > ${NM_LOGFOLDER}/cert-renewal.lastrun + + CONCAT_SSL chown -R root:le ${NM_CERTPATH} >> ${NM_LOGFOLDER}/cert-renewal.lastrun chmod -R 6775 ${NM_CERTPATH} >> ${NM_LOGFOLDER}/cert-renewal.lastrun + daterun=`date +%Y-%m-%d-%H-%M-%S` echo -e "${daterun}" >> ${NM_LOGFOLDER}/cert-renewal.lastrun DIVIDER true @@ -170,7 +175,7 @@ CERTRENEW(){ fi } NIGHTLYRENEW(){ - ${CERT_DAEMON} renew ${CERTAUTH} + ${CERT_DAEMON} --authenticator certbot-dns-powerdns:dns-powerdns --certbot-dns-powerdns:dns-powerdns-credentials ${NM_FOLDER}/conf/pdns-credentials.ini renew ${CERTAUTH} CONCAT_SSL chown -R root:le ${NM_CERTPATH} chmod -R 6775 ${NM_CERTPATH}