nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-23 15:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove option ec2.metadata

Browse Source
This commit is contained in:
Eelco Dolstra 2015-06-30 17:25:30 +02:00
parent 433a13d12a
commit 96b325b0b7
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/rename.nix
View File

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

1
nixos/modules/virtualisation/amazon-init.nix
View File

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

10
nixos/modules/virtualisation/ec2-data.nix
View File

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