Compare commits

...

3 commits

Author SHA1 Message Date
1a248f1dc1 Bump tokio dependency 2021-06-03 21:15:56 +02:00
9694ed0138 Stable test 2021-06-03 01:06:10 +02:00
750dedb752 Switch x3 to r3 cert 2021-06-03 00:49:22 +02:00
5 changed files with 13 additions and 7 deletions

View file

@ -10,7 +10,7 @@ users = "0.11.0"
regex = "1.0.1"
futures = "0.3"
async-trait = "0.1"
tokio = { version = "0.3", features = ["rt", "process", "io-util", "macros", "sync"] }
tokio = { version = "1.6.1", features = ["rt", "process", "io-util", "macros", "sync"] }
once_cell = "1.4"
[dev-dependencies]

View file

@ -6,7 +6,7 @@ use crate::resources::{
Resource, ServeCustom, ServePhp, ServeRedir, ServeService, ServeStatic, StoredDirectory,
SystemdSocketService, User, UserForDomain, WordpressPlugin, WordpressTranslation,
};
use crate::static_files::LETS_ENCRYPT_X3_CROSS_SIGNED;
use crate::static_files::LETS_ENCRYPT_R3_CROSS_SIGNED;
use crate::storage::SimpleStorage;
use crate::storage::Storage;
use crate::symbols::acme::Cert as CertSymbol;
@ -676,7 +676,7 @@ impl ImplementationBuilder<AcmeRootCert> for DefaultBuilder {
target: &<AcmeRootCert as Resource>::Artifact,
(): <Self::Prerequisites as ToArtifact>::Artifact,
) -> Self::Implementation {
FileSymbol::new(target.clone().into(), LETS_ENCRYPT_X3_CROSS_SIGNED)
FileSymbol::new(target.clone().into(), LETS_ENCRYPT_R3_CROSS_SIGNED)
}
}

View file

@ -22,7 +22,7 @@
clippy::future_not_send,
clippy::missing_errors_doc,
clippy::module_name_repetitions,
rustdoc,
rustdoc::all,
missing_docs,
missing_copy_implementations
)]

View file

@ -243,7 +243,7 @@ impl<P: Policy> ResourceLocator<AcmeRootCert> for DefaultLocator<P> {
let acme_user = P::acme_user();
let home = P::user_home(acme_user);
(
PathArtifact::from(home.join("lets_encrypt_x3_cross_signed.pem")),
PathArtifact::from(home.join("lets_encrypt_r3_cross_signed.pem")),
Dir(home),
)
}

View file

@ -136,14 +136,20 @@ mod test {
let start = Instant::now();
assert!(run(checkout.target_reached()).unwrap());
let end = Instant::now();
let mut args = c.args.into_inner();
let first_two_args = &mut args[0..2];
first_two_args.sort_unstable();
assert_eq!(
c.args.into_inner(),
first_two_args,
[
["-C", "target", "fetch", "source", "branch"],
["-C", "target", "rev-list", "-1", "HEAD"],
["-C", "target", "rev-list", "-1", "FETCH_HEAD"]
]
);
drop(first_two_args);
assert_eq!(args[2],
["-C", "target", "rev-list", "-1", "FETCH_HEAD"]);
assert!((end - start).as_millis() >= 100);
assert!((end - start).as_millis() < 150);
}