diff options
| author | AmineChikhaoui <amine.chikhaoui91@gmail.com> | 2018-05-31 12:49:15 +0100 |
|---|---|---|
| committer | AmineChikhaoui <amine.chikhaoui91@gmail.com> | 2018-05-31 12:49:15 +0100 |
| commit | 95c05343ce292cd97c120f68131560947e25122c (patch) | |
| tree | 36f1c714eb0028288de0ef2b33a5ad244e1893ea /nixos/modules/virtualisation/google-compute-image.nix | |
| parent | 288ce0cb845c03fafa1f3c673440e9922f22131a (diff) | |
| download | nixlib-95c05343ce292cd97c120f68131560947e25122c.tar nixlib-95c05343ce292cd97c120f68131560947e25122c.tar.gz nixlib-95c05343ce292cd97c120f68131560947e25122c.tar.bz2 nixlib-95c05343ce292cd97c120f68131560947e25122c.tar.lz nixlib-95c05343ce292cd97c120f68131560947e25122c.tar.xz nixlib-95c05343ce292cd97c120f68131560947e25122c.tar.zst nixlib-95c05343ce292cd97c120f68131560947e25122c.zip | |
revert 4a86f8c9abd99b880b8a9c3609d330c7ff398ad5 and properly remove
the temporary ssh host keys file/directory.
Diffstat (limited to 'nixos/modules/virtualisation/google-compute-image.nix')
| -rw-r--r-- | nixos/modules/virtualisation/google-compute-image.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 374a84332357..5957c95a86dd 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -253,11 +253,12 @@ in mv -f $SSH_HOST_KEYS_DIR/ssh_host_ed25519_key* /etc/ssh/ chmod 600 /etc/ssh/ssh_host_ed25519_key chmod 644 /etc/ssh/ssh_host_ed25519_key.pub + rm $SSH_HOST_KEYS_DIR/* else echo "Setup of ssh host keys from http://metadata.google.internal/computeMetadata/v1/instance/attributes/ failed." false fi - rm -f $SSH_HOST_KEYS_DIR + rm -r $SSH_HOST_KEYS_DIR ''; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; |