summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2021-03-07 13:24:54 +0200
committerLars Wirzenius <liw@liw.fi>2021-03-07 13:24:54 +0200
commit26eb4ad6076fbd6a0f3ebef6c4f227dafd177d40 (patch)
treee283ad3e921292fbecf2fa480d0212eff026be25
parent50560ee9bc2f6c7fa7c601c320bd328c77d03d99 (diff)
downloadvmadm-26eb4ad6076fbd6a0f3ebef6c4f227dafd177d40.tar.gz
fix: how effective host key cert setting is computed
-rw-r--r--src/spec.rs9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/spec.rs b/src/spec.rs
index 928628e..2c13af7 100644
--- a/src/spec.rs
+++ b/src/spec.rs
@@ -202,6 +202,13 @@ impl Specification {
} else {
config.ca_key.clone()
};
+ let gen_cert = if let Some(v) = &input.generate_host_certificate {
+ *v
+ } else if let Some(v) = &config.default_generate_host_certificate {
+ *v
+ } else {
+ false
+ };
let spec = Specification {
name: name.to_string(),
@@ -219,7 +226,7 @@ impl Specification {
image_size_gib: input.image_size_gib(config, name)?,
memory_mib: input.memory_mib(config, name)?,
cpus: input.cpus(config, name)?,
- generate_host_certificate: input.generate_host_certificate.or(Some(false)).unwrap(),
+ generate_host_certificate: gen_cert,
ca_key: ca_key,
};