From 922dde3ff0ebaab70df8a8bfa402c1d19b624f51 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Thu, 6 Apr 2023 15:11:28 +0200 Subject: check-certificates: make the function return a status --- check-certificates.rsc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/check-certificates.rsc b/check-certificates.rsc index fa0963f..db1127c 100644 --- a/check-certificates.rsc +++ b/check-certificates.rsc @@ -34,6 +34,8 @@ :global UrlEncode; :global WaitForFile; + :local Return false; + :foreach Type in={ ".pem"; ".p12" } do={ :local CertFileName ([ $UrlEncode $Name ] . $Type); :do { @@ -57,10 +59,14 @@ :foreach CertInChain in=[ /certificate/find where name~("^" . $CertFileName . "_[0-9]+\$") common-name!=$Name !(common-name=[]) ] do={ $CertificateNameByCN [ /certificate/get $CertInChain common-name ]; } + + :set Return true; } on-error={ $LogPrintExit2 debug $0 ("Could not download certificate file " . $CertFileName) false; } } + + :return $Return; } :local FormatInfo do={ @@ -106,7 +112,8 @@ $WaitFullyConnected; } $LogPrintExit2 info $0 ("Attempting to renew certificate " . ($CertVal->"name") . ".") false; - $CheckCertificatesDownloadImport ($CertVal->"common-name"); + :local ImportSuccess false; + :set ImportSuccess [ $CheckCertificatesDownloadImport ($CertVal->"common-name") ]; :local CertNew [ /certificate/find where common-name=($CertVal->"common-name") fingerprint!=[ :tostr ($CertVal->"fingerprint") ] expires-after>$CertRenewTime ]; :local CertNewVal [ /certificate/get $CertNew ]; -- cgit v1.2.3-54-g00ecf