adrian/schematics
1
0
Fork 0
Code Issues Pull requests Releases Activity

Adapt to trixie openssl

Browse source
This commit is contained in:
Adrian Heine 2025-09-02 11:55:58 +02:00
parent 0a6b6efd7a
commit d01c3f84cc
1 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/symbols/acme/cert.rs
View file

@ -66,12 +66,18 @@ impl<_C: CommandRunner, C: Borrow<_C>, D: AsRef<str>, P: AsRef<Path>> Symbol for
) )
.await?; .await?;
if output.status.success() if output.status.success()
&& output.stdout && (output.stdout
== format!( == format!(
"subject=CN = {}\nCertificate will not expire\n", "subject=CN = {}\nCertificate will not expire\n",
self.domain.as_ref() self.domain.as_ref()
) )
.as_bytes() .as_bytes()
|| output.stdout
== format!(
"subject=CN={}\nCertificate will not expire\n",
self.domain.as_ref()
)
.as_bytes())
{ {
Ok( Ok(
self self
@ -94,12 +100,18 @@ impl<_C: CommandRunner, C: Borrow<_C>, D: AsRef<str>, P: AsRef<Path>> Symbol for
.is_ok(), .is_ok(),
) )
} else if output.status.code() == Some(1) } else if output.status.code() == Some(1)
&& output.stdout && (output.stdout
== format!( == format!(
"subject=CN = {}\nCertificate will expire\n", "subject=CN = {}\nCertificate will expire\n",
self.domain.as_ref() self.domain.as_ref()
) )
.as_bytes() .as_bytes()
|| output.stdout
== format!(
"subject=CN={}\nCertificate will expire\n",
self.domain.as_ref()
)
.as_bytes())
{ {
Ok(false) Ok(false)
} else { } else {