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:16:36 -06:00
parent a803e657c6
commit 7113174716
2 changed files with 14 additions and 16 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.21-11122023' VERS='4.13.22-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'

24
inc/sites.inc
View File

@@ -767,6 +767,7 @@ SITEINFO(){
SUBJECTNAMES="" SUBJECTNAMES=""
else else
ssl='Yes' ssl='Yes'
certpath=$(grep ssl_certificate_key ${sitefile}) certpath=$(grep ssl_certificate_key ${sitefile})
certpath=${certpath%/*} certpath=${certpath%/*}
certpath=${certpath#* } certpath=${certpath#* }
@@ -775,30 +776,27 @@ SITEINFO(){
SUBJECTNAMES=${SUBJECTNAMES//$'\n'/, } SUBJECTNAMES=${SUBJECTNAMES//$'\n'/, }
fi fi
if [ "$(grep include/proxy.conf ${sitefile})" != "" ]; then if [ "$(echo "${siteconfig}" | grep include/proxy.conf)" != "" ]; then
type='Proxy' type='Proxy'
server=$(grep 'set $server' ${sitefile}) server=$(echo "${siteconfig}" | grep 'set $server')
server=${server#*\"}; server=${server%\"*} server=${server#*\"}; server=${server%\"*}
servernames=$(echo "${siteconfig}" | grep 'server_name')
servernames=$(grep 'server_name' ${sitefile})
servernames=${servernames//;/} servernames=${servernames//;/}
servernames=${servernames#* } servernames=${servernames#* }
servernames=${servernames// /,} servernames=${servernames// /,}
scheme=$(echo "${siteconfig}" | grep 'set $forward_scheme')
scheme=$(grep 'set $forward_scheme' ${sitefile})
scheme=${scheme##* }; scheme=${scheme%;*} scheme=${scheme##* }; scheme=${scheme%;*}
port=$(grep 'set $port' ${sitefile}) port=$(echo "${siteconfig}" | grep 'set $port')
port=${port##* }; port=${port%;*} port=${port##* }; port=${port%;*}
else else
type='HTTP' type='HTTP'
fi fi
[ "$(grep '\#include conf.d/include/hsts-support.conf' ${sitefile})" != "" ] && hsts='-' || hsts='Yes' [ "$(echo "${siteconfig}" | grep '\#include conf.d/include/hsts-support.conf')" != "" ] && hsts='-' || hsts='Yes'
[ "$(grep '\#include conf.d/include/websocket-support.conf' ${sitefile})" != "" ] && wbskt='-' || wbskt='Yes' [ "$(echo "${siteconfig}" | grep '\#include conf.d/include/websocket-support.conf')" != "" ] && wbskt='-' || wbskt='Yes'
[ "$(grep '\#include conf.d/include/block-exploits.conf' ${sitefile})" != "" ] && explt='-' || explt='Yes' [ "$(echo "${siteconfig}" | grep '\#include conf.d/include/block-exploits.conf')" != "" ] && explt='-' || explt='Yes'
# [ "$(grep '\#include conf.d/include/secure-access.conf' ${sitefile})" != "" ] && lock='-' || lock='Yes' if [ "$(echo "${siteconfig}" | grep '\#include conf.d/include/secure-access.conf')" == "" ]; then
if [ "$(grep '\#include conf.d/include/secure-access.conf' ${sitefile})" == "" ]; then sitefacline=$(echo "${autheliaconfig}" | grep -Fn ${site} | sort | tail -n1)
sitefacline=$(ssh root@${NM_AUTHELIA_IP} grep -Fn ${site} /mnt/web-data/authelia/config/configuration.yml | sort | tail -n1)
sitefacline=${onefacline%%:*} sitefacline=${onefacline%%:*}
if [ "${sitefacline}" == "" ]; then if [ "${sitefacline}" == "" ]; then
lock='error' lock='error'