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-12 19:42:56 -06:00
parent 96a4e8d549
commit 91c9ff1886
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
defaults.inc
View File

@@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
VERS='4.13.22-11122023' VERS='4.13.23-11122023'
noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update ' 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' CERT_DAEMON='/snap/bin/certbot'

7
inc/sites.inc
View File

@@ -715,7 +715,7 @@ SITEINFO(){
lock='2FA' lock='2FA'
fi fi
else else
lock='-' lock=''
fi fi
@@ -763,13 +763,14 @@ SITEINFO(){
elif [ "${SITELIST[${siteid}]}" != "" ]; then elif [ "${SITELIST[${siteid}]}" != "" ]; then
site=${SITELIST[${siteid}]} site=${SITELIST[${siteid}]}
sitefile=${gosite}/${site}.conf sitefile=${gosite}/${site}.conf
if [ "$(grep \#ssl_certificate ${sitefile})" != "" ]; then siteconfig=$(cat ${sitefile})
if [ "$(echo "${siteconfig}" | grep \#ssl_certificate)" != "" ]; then
ssl='-' ssl='-'
SUBJECTNAMES="" SUBJECTNAMES=""
else else
ssl='Yes' ssl='Yes'
certpath=$(grep ssl_certificate_key ${sitefile}) certpath=$(echo "${siteconfig}" | grep ssl_certificate_key)
certpath=${certpath%/*} certpath=${certpath%/*}
certpath=${certpath#* } certpath=${certpath#* }
SUBJECTNAMES=$(openssl x509 -in ${certpath}/cert.pem -noout -text|grep -oP '(?<=DNS:|IP Address:)[^,]+'|sort -uV) SUBJECTNAMES=$(openssl x509 -in ${certpath}/cert.pem -noout -text|grep -oP '(?<=DNS:|IP Address:)[^,]+'|sort -uV)