diff --git a/defaults.inc b/defaults.inc index d1041dd3..d6f31ed0 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.12.108-11102023' +VERS='4.12.111-11102023' 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' diff --git a/inc/certs.inc b/inc/certs.inc index 8dbd36e6..57f862f6 100755 --- a/inc/certs.inc +++ b/inc/certs.inc @@ -1,24 +1,23 @@ #!/usr/bin/env bash NEWCERT(){ CERTTEST=0 - if [ -z ${1+x} ]; then - echo -e -n "${idsCL[LightCyan]}Create certificate for what name (comma seperated for mutiple) : ${idsCL[Default]}" - read NEW_CERT - echo - else - NEW_CERT=${1} - fi if [ ${3} -eq 0 ] || [ ${3} -eq 1 ]; then + NEW_CERT=${1} CERTTEST=${3} else - CERTTEST=0 while [ $# -gt 0 ]; do - case "$1" in + case "${1}" in -test) CERTTEST=1;; + *) NEW_CERT=${1};; esac shift done fi + if [ "${NEW_CERT}" == "" ]; then + echo -en "\n${idsCL[LightCyan]}Create certificate for what name (comma seperated for mutiple) : ${idsCL[Default]}" + read NEW_CERT + echo + fi echo if [[ ${NEW_CERT} == *","* ]]; then @@ -42,8 +41,7 @@ NEWCERT(){ else $CERT_DAEMON certonly --webroot --preferred-chain "ISRG Root X1" -w ${NM_CERTPATH}/letsencrypt-acme-challenge -d ${NEW_CERT} fi - # $CERT_DAEMON certonly --dry-run --webroot -w ${NM_CERTPATH}/letsencrypt-acme-challenge -d ${NEW_CERT} - + chown -R root:le ${NM_CERTPATH} chmod -R 6775 ${NM_CERTPATH}