diff --git a/defaults.inc b/defaults.inc index dfb69724..4b230f14 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.10.16-07162023' +VERS='4.10.17-07202023' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns ' CERT_DAEMON='/snap/bin/certbot' @@ -138,9 +138,6 @@ fi [ "${NM_CERTPATHS[${RUN_NODE_TYPE}]}" != "" ] && NM_CERTPATH=${NM_CERTPATHS[${RUN_NODE_TYPE}]} || NM_CERTPATH=/etc/letsencrypt [ "${NM_WWWPATHS[${RUN_NODE_TYPE}]}" != "" ] && NM_WWWPATH=${NM_WWWPATHS[${RUN_NODE_TYPE}]} || NM_WWWPATH=/var/www -echo ${NM_CERTPATH} - - declare -A NM_SRVCOPTS NM_SRVCOPTS['status']='Status' NM_SRVCOPTS['start']='Start' diff --git a/inc/sites.inc b/inc/sites.inc index 0e9eb8cc..549dff2d 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -423,6 +423,7 @@ NEWSITE(){ sed -i "s/<>/${HSTS}/g" ${nginxconfig} sed -i "s/<>/${EXPLOITS}/g" ${nginxconfig} sed -i "s/<>/${SECURE}/g" ${nginxconfig} + sed -i "s/<>/${NM_CERTPATH}/g" ${nginxconfig} fi if [ "${CREATE_SSL}" = "yes" ]; then diff --git a/templates/nginx.proxy.site b/templates/nginx.proxy.site index 6cc771ce..89211abe 100644 --- a/templates/nginx.proxy.site +++ b/templates/nginx.proxy.site @@ -12,8 +12,8 @@ server { include conf.d/include/letsencrypt-acme-challenge.conf; include conf.d/include/ssl-ciphers.conf; - #ssl_certificate ${NM_CERTPATH}/live/<>/fullchain.pem; - #ssl_certificate_key ${NM_CERTPATH}/live/<>/privkey.pem; + #ssl_certificate <>/live/<>/fullchain.pem; + #ssl_certificate_key <>/live/<>/privkey.pem; access_log /var/log/nginx/<>.proxy.log proxy; error_log /var/log/nginx/<>.error.log warn; diff --git a/templates/nginx.ssl.site b/templates/nginx.ssl.site index 89e1f8cf..397f9b08 100755 --- a/templates/nginx.ssl.site +++ b/templates/nginx.ssl.site @@ -9,8 +9,8 @@ server { access_log /var/log/nginx/<>-access.log; error_log /var/log/nginx/<>-error.log warn; - ssl_certificate ${NM_CERTPATH}/live/<>/fullchain.pem; - ssl_certificate_key ${NM_CERTPATH}/live/<>/privkey.pem; + ssl_certificate <>/live/<>/fullchain.pem; + ssl_certificate_key <>/live/<>/privkey.pem; include conf.d/include/ssl-ciphers.conf; index index.php index.html index.htm;