From 95c05343ce292cd97c120f68131560947e25122c Mon Sep 17 00:00:00 2001
From: AmineChikhaoui <amine.chikhaoui91@gmail.com>
Date: Thu, 31 May 2018 12:49:15 +0100
Subject: [PATCH] revert 4a86f8c9abd99b880b8a9c3609d330c7ff398ad5 and properly
 remove the temporary ssh host keys file/directory.

---
 nixos/modules/virtualisation/google-compute-image.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 374a8433235..5957c95a86d 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;