diff --git a/defaults.inc b/defaults.inc index d6d67f85..420a2bdd 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/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 ' CERT_DAEMON='/snap/bin/certbot' diff --git a/inc/sites.inc b/inc/sites.inc index e38d7357..fc96de09 100755 --- a/inc/sites.inc +++ b/inc/sites.inc @@ -715,7 +715,7 @@ SITEINFO(){ lock='2FA' fi else - lock='-' + lock='' fi @@ -763,13 +763,14 @@ SITEINFO(){ elif [ "${SITELIST[${siteid}]}" != "" ]; then site=${SITELIST[${siteid}]} sitefile=${gosite}/${site}.conf - if [ "$(grep \#ssl_certificate ${sitefile})" != "" ]; then + siteconfig=$(cat ${sitefile}) + if [ "$(echo "${siteconfig}" | grep \#ssl_certificate)" != "" ]; then ssl='-' SUBJECTNAMES="" else ssl='Yes' - certpath=$(grep ssl_certificate_key ${sitefile}) + certpath=$(echo "${siteconfig}" | grep ssl_certificate_key) certpath=${certpath%/*} certpath=${certpath#* } SUBJECTNAMES=$(openssl x509 -in ${certpath}/cert.pem -noout -text|grep -oP '(?<=DNS:|IP Address:)[^,]+'|sort -uV)