From 4239e276ea0c0604ad1de38c46e3a615ae535222 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 4 May 2015 16:56:46 +0200 Subject: [PATCH] fetch-ec2-data: Don't restart This service only needs to run once on system startup, so it doesn't need to be restarted by switch-to-configuration. --- nixos/modules/virtualisation/ec2-data.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix index 15114b1e76a..b21c6bfbc0b 100644 --- a/nixos/modules/virtualisation/ec2-data.nix +++ b/nixos/modules/virtualisation/ec2-data.nix @@ -35,8 +35,8 @@ with lib; wget="wget -q --retry-connrefused -O -" - echo "setting host name..." ${optionalString (config.networking.hostName == "") '' + echo "setting host name..." ${pkgs.nettools}/bin/hostname $($wget http://169.254.169.254/1.0/meta-data/hostname) ''} @@ -69,14 +69,18 @@ with lib; fi ${optionalString (! config.ec2.metadata) '' - # Since the user data is sensitive, prevent it from being - # accessed from now on. - ip route add blackhole 169.254.169.254/32 + # 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"; serviceConfig.RemainAfterExit = true; + + restartIfChanged = false; }; systemd.services."print-host-key" =