summary refs log tree commit diff
path: root/nixos/modules/virtualisation
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-06-30 17:03:11 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-06-30 17:04:19 +0200
commit32b9ca3219e38b4a0b8d01156ac93c4c92413b08 (patch)
tree399ac9d05bd958ff2d817a147406f4b7eb0ddcd2 /nixos/modules/virtualisation
parent16406e63b310e832b017bf9ef0473a6aa792f7da (diff)
downloadnixlib-32b9ca3219e38b4a0b8d01156ac93c4c92413b08.tar
nixlib-32b9ca3219e38b4a0b8d01156ac93c4c92413b08.tar.gz
nixlib-32b9ca3219e38b4a0b8d01156ac93c4c92413b08.tar.bz2
nixlib-32b9ca3219e38b4a0b8d01156ac93c4c92413b08.tar.lz
nixlib-32b9ca3219e38b4a0b8d01156ac93c4c92413b08.tar.xz
nixlib-32b9ca3219e38b4a0b8d01156ac93c4c92413b08.tar.zst
nixlib-32b9ca3219e38b4a0b8d01156ac93c4c92413b08.zip
EC2: Don't blackhole 169.254.169.254
https://github.com/NixOS/nixops/issues/267
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r--nixos/modules/virtualisation/ec2-data.nix10
1 files changed, 0 insertions, 10 deletions
diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix
index 0b2479c10462..cc641b1a9870 100644
--- a/nixos/modules/virtualisation/ec2-data.nix
+++ b/nixos/modules/virtualisation/ec2-data.nix
@@ -31,8 +31,6 @@ with lib;
 
         script =
           ''
-            ip route del blackhole 169.254.169.254/32 || true
-
             wget="wget -q --retry-connrefused -O -"
 
             ${optionalString (config.networking.hostName == "") ''
@@ -67,14 +65,6 @@ with lib;
                 (umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key)
                 echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub
             fi
-
-            ${optionalString (! config.ec2.metadata) ''
-              # Since the user data is sensitive, prevent it from
-              # being accessed from now on. FIXME: remove at some
-              # point, since current NixOps no longer relies on
-              # metadata secrecy.
-              ip route add blackhole 169.254.169.254/32
-            ''}
           '';
 
         serviceConfig.Type = "oneshot";