about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2017-11-30 13:06:25 +0100
committerGitHub <noreply@github.com>2017-11-30 13:06:25 +0100
commit949a6e3ec59e549706036a78753289bceca89a11 (patch)
tree98ba0f94f741a98f3032e63e14b6ca818ee91e6c
parentd477bc353c7be703a54d735f4836e5d1088d7b58 (diff)
parent5fd528d043636bc8b41577b91ada2ac25bbe7ae4 (diff)
downloadnixlib-949a6e3ec59e549706036a78753289bceca89a11.tar
nixlib-949a6e3ec59e549706036a78753289bceca89a11.tar.gz
nixlib-949a6e3ec59e549706036a78753289bceca89a11.tar.bz2
nixlib-949a6e3ec59e549706036a78753289bceca89a11.tar.lz
nixlib-949a6e3ec59e549706036a78753289bceca89a11.tar.xz
nixlib-949a6e3ec59e549706036a78753289bceca89a11.tar.zst
nixlib-949a6e3ec59e549706036a78753289bceca89a11.zip
Merge pull request #32188 from NixOS/copumpkin-aws-ntp
amazon-image: use NTP provided by the hypervisor
-rw-r--r--nixos/modules/virtualisation/amazon-image.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 1eb3ca707afd..6cb9e07ae820 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -152,5 +152,8 @@ let cfg = config.ec2; in
     environment.systemPackages = [ pkgs.cryptsetup ];
 
     boot.initrd.supportedFilesystems = [ "unionfs-fuse" ];
+    
+    # EC2 has its own NTP server provided by the hypervisor
+    networking.timeServers = [ "169.254.169.123" ];
   };
 }