summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/spec.rs2
-rw-r--r--vmadm.md9
2 files changed, 6 insertions, 5 deletions
diff --git a/src/spec.rs b/src/spec.rs
index 9f8d3e8..5dc7714 100644
--- a/src/spec.rs
+++ b/src/spec.rs
@@ -284,7 +284,7 @@ impl Specification {
let key_filenames = input.ssh_key_files(config, name)?;
let ssh_keys = ssh_keys(&key_filenames)?;
let ca_key = if let Some(filename) = &input.ca_key {
- Some(filename.clone())
+ Some(expand_tilde(filename))
} else {
config.ca_key.clone()
};
diff --git a/vmadm.md b/vmadm.md
index a109a44..1b004f4 100644
--- a/vmadm.md
+++ b/vmadm.md
@@ -50,7 +50,7 @@ default_memory_mib: 2048
default_cpus: 1
default_generate_host_certificate: true
default_autostart: true
-ca_key: ca_key
+ca_key: ~/ca_key
authorized_keys:
- ~/.ssh/id_rsa.pub
~~~
@@ -67,7 +67,7 @@ authorized_keys:
"default_networks": [
"default"
],
- "ca_key": "ca_key",
+ "ca_key": "~/ca_key",
"authorized_keys": [
"~/.ssh/id_rsa.pub"
]
@@ -75,7 +75,8 @@ authorized_keys:
~~~
~~~{#spec.yaml .file .yaml}
-foo: {}
+foo:
+ ca_key: ~/other_ca
~~~
~~~{#fullspec.json .file .json}
@@ -101,7 +102,7 @@ foo: {}
"cpus": 1,
"generate_host_certificate": true,
"autostart": true,
- "ca_key": "ca_key"
+ "ca_key": "~/other_ca"
}
]
~~~