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

update

Browse Source
This commit is contained in:
David Schroeder
2023-07-20 20:44:57 -05:00
parent 50f3049257
commit 4fe482276a
4 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
defaults.inc
View File

@@ -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'

1
inc/sites.inc
View File

@@ -423,6 +423,7 @@ NEWSITE(){
sed -i "s/<<HSTS>>/${HSTS}/g" ${nginxconfig}
sed -i "s/<<EXPLOITS>>/${EXPLOITS}/g" ${nginxconfig}
sed -i "s/<<SECURE>>/${SECURE}/g" ${nginxconfig}
sed -i "s/<<NM_CERTPATH>>/${NM_CERTPATH}/g" ${nginxconfig}
fi
if [ "${CREATE_SSL}" = "yes" ]; then

4
templates/nginx.proxy.site
View File

@@ -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/<<MAIN_SITE>>/fullchain.pem;
#ssl_certificate_key ${NM_CERTPATH}/live/<<MAIN_SITE>>/privkey.pem;
#ssl_certificate <<NM_CERTPATH>>/live/<<MAIN_SITE>>/fullchain.pem;
#ssl_certificate_key <<NM_CERTPATH>>/live/<<MAIN_SITE>>/privkey.pem;
access_log /var/log/nginx/<<MAIN_SITE>>.proxy.log proxy;
error_log /var/log/nginx/<<MAIN_SITE>>.error.log warn;

4
templates/nginx.ssl.site
View File

@@ -9,8 +9,8 @@ server {
access_log /var/log/nginx/<<HOSTNAME>>-access.log;
error_log /var/log/nginx/<<HOSTNAME>>-error.log warn;
ssl_certificate ${NM_CERTPATH}/live/<<HOSTNAME>>/fullchain.pem;
ssl_certificate_key ${NM_CERTPATH}/live/<<HOSTNAME>>/privkey.pem;
ssl_certificate <<NM_CERTPATH>>/live/<<HOSTNAME>>/fullchain.pem;
ssl_certificate_key <<NM_CERTPATH>>/live/<<HOSTNAME>>/privkey.pem;
include conf.d/include/ssl-ciphers.conf;
index index.php index.html index.htm;