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

update

Browse Source
This commit is contained in:
David Schroeder
2023-11-11 16:27:29 -06:00
parent 34730e41fa
commit 2a9c432b49
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
defaults.inc
View File

@@ -1,6 +1,5 @@
#!/usr/bin/env bash
# VERS='4.12.120-11102023'
VERS='4.12.128-KYLEUPGRADEv3'
VERS='4.12.140-11112023'
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'

18
inc/sites.inc
View File

@@ -627,16 +627,16 @@ SITEINFO(){
fi
site=${SITELIST[${siteid}]}
sitefile=${gosite}/${site}.conf
certpath=$(grep ssl_certificate_key ${sitefile})
if [ "${certpath}" != "" ]; then
if [ "$(grep \#ssl_certificate ${sitefile})" != "" ]; then
ssl='-'
SUBJECTNAMES=""
else
ssl='Yes'
certpath=$(grep ssl_certificate_key ${sitefile})
certpath=${certpath%/*}; certpath=${certpath#* }
SUBJECTNAMES=$(openssl x509 -in ${certpath}/cert.pem -noout -text|grep -oP '(?<=DNS:|IP Address:)[^,]+'|sort -uV)
CERTEXPIRE=$(date -d "$(: | openssl x509 -in ${certpath}/cert.pem -text | grep 'Not After' |awk '{print $4,$5,$7}')" '+%s');
SUBJECTNAMES=${SUBJECTNAMES//$'\n'/, }
else
ssl='-'
SUBJECTNAMES=""
fi
if [ "$(grep include/proxy.conf ${sitefile})" != "" ]; then
@@ -659,10 +659,10 @@ SITEINFO(){
type='HTTP'
proxyhost=''
fi
[ "$(grep \\\#include/hsts-support.conf ${sitefile})" != "" ] && hsts='-' || hsts='Yes'
[ "$(grep \\\#include/websocket-support.conf ${sitefile})" != "" ] && wbskt='-' || wbskt='Yes'
[ "$(grep \\\#include/block-exploits.conf ${sitefile})" != "" ] && explt='-' || explt='Yes'
[ "$(grep \\\#include/secure-access.conf ${sitefile})" != "" ] && lock='-' || lock='Yes'
[ "$(grep '\#include conf.d/include/hsts-support.conf' ${sitefile})" != "" ] && hsts='-' || hsts='Yes'
[ "$(grep '\#include conf.d/include/websocket-support.conf' ${sitefile})" != "" ] && wbskt='-' || wbskt='Yes'
[ "$(grep '\#include conf.d/include/block-exploits.conf' ${sitefile})" != "" ] && explt='-' || explt='Yes'
[ "$(grep '\#include conf.d/include/secure-access.conf' ${sitefile})" != "" ] && lock='-' || lock='Yes'
f=0
until [ "${edit}" = "c" ]; do
echo -e "\033[K${idsCL[White]}0) Site Address(es): ${idsCL[Cyan]}${idsST[Bold]}${servernames}${idsST[Reset]}"

2
templates/nginx.proxy.site
View File

@@ -7,7 +7,7 @@ server {
listen 80;
listen 443 ssl;
#include conf.d/include/secure-access.conf;