diff options
| author | Lars Wirzenius <liw@liw.fi> | 2021-08-08 09:51:10 +0300 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2021-08-08 10:02:53 +0300 |
| commit | 1444e6d5a8353d84744a4203696a7ba52bc6105f (patch) | |
| tree | bb7694a33df0763d8a63fdc5034ac6569142cba9 | |
| parent | 565a5230ee343d7d0ce247d8e37e50ed660ae2f6 (diff) | |
| download | vmadm-1444e6d5a8353d84744a4203696a7ba52bc6105f.tar.gz | |
feat: expand tilde notation in the CA key field in a spec
Sponsored-by: author
| -rw-r--r-- | src/spec.rs | 2 | ||||
| -rw-r--r-- | vmadm.md | 9 |
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() }; @@ -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" } ] ~~~ |