Remove option ec2.metadata

wip/yesman
Eelco Dolstra 9 years ago
parent 433a13d12a
commit 96b325b0b7
  1. 1
      nixos/modules/rename.nix
  2. 1
      nixos/modules/virtualisation/amazon-init.nix
  3. 10
      nixos/modules/virtualisation/ec2-data.nix

@ -148,5 +148,6 @@ in zipModules ([]
++ obsolete' [ "services" "samba" "defaultShare" ]
++ obsolete' [ "services" "syslog-ng" "serviceName" ]
++ obsolete' [ "services" "syslog-ng" "listenToJournal" ]
++ obsolete' [ "ec2" "metadata" ]
)

@ -45,7 +45,6 @@ let
'';
in {
imports = [ "${modulesPath}/virtualisation/amazon-image.nix" ];
ec2.metadata = true;
boot.postBootCommands = ''
${bootScript} &
'';

@ -7,16 +7,6 @@
with lib;
{
options = {
ec2.metadata = mkOption {
type = types.bool;
default = false;
description = ''
Whether to allow access to EC2 metadata.
'';
};
};
config = {
systemd.services."fetch-ec2-data" =

Loading…
Cancel
Save