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