diff options
Diffstat (limited to 'nixos/modules/virtualisation')
| -rw-r--r-- | nixos/modules/virtualisation/ec2-amis.nix | 32 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/google-compute-image.nix | 2 |
2 files changed, 17 insertions, 17 deletions
diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index 44f00d7730be..01512911a057 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -223,22 +223,22 @@ let self = { "17.03".us-west-2.hvm-ebs = "ami-a93daac9"; "17.03".us-west-2.hvm-s3 = "ami-5139ae31"; - # 17.09.2356.cb751f9b1c3 - "17.09".eu-west-1.hvm-ebs = "ami-d40185ad"; - "17.09".eu-west-2.hvm-ebs = "ami-c5445da1"; - "17.09".eu-west-3.hvm-ebs = "ami-2636815b"; - "17.09".eu-central-1.hvm-ebs = "ami-e758d388"; - "17.09".us-east-1.hvm-ebs = "ami-865327fc"; - "17.09".us-east-2.hvm-ebs = "ami-074d6562"; - "17.09".us-west-1.hvm-ebs = "ami-992c28f9"; - "17.09".us-west-2.hvm-ebs = "ami-2bd87953"; - "17.09".ca-central-1.hvm-ebs = "ami-c4bb01a0"; - "17.09".ap-southeast-1.hvm-ebs = "ami-5ff79723"; - "17.09".ap-southeast-2.hvm-ebs = "ami-57e71135"; - "17.09".ap-northeast-1.hvm-ebs = "ami-5249c434"; - "17.09".ap-northeast-2.hvm-ebs = "ami-f1288e9f"; - "17.09".sa-east-1.hvm-ebs = "ami-5492d438"; - "17.09".ap-south-1.hvm-ebs = "ami-c4fab2ab"; + # 17.09.2681.59661f21be6 + "17.09".eu-west-1.hvm-ebs = "ami-a30192da"; + "17.09".eu-west-2.hvm-ebs = "ami-295a414d"; + "17.09".eu-west-3.hvm-ebs = "ami-8c0eb9f1"; + "17.09".eu-central-1.hvm-ebs = "ami-266cfe49"; + "17.09".us-east-1.hvm-ebs = "ami-40bee63a"; + "17.09".us-east-2.hvm-ebs = "ami-9d84aff8"; + "17.09".us-west-1.hvm-ebs = "ami-d14142b1"; + "17.09".us-west-2.hvm-ebs = "ami-3eb40346"; + "17.09".ca-central-1.hvm-ebs = "ami-ca8207ae"; + "17.09".ap-southeast-1.hvm-ebs = "ami-84bccff8"; + "17.09".ap-southeast-2.hvm-ebs = "ami-0dc5386f"; + "17.09".ap-northeast-1.hvm-ebs = "ami-89b921ef"; + "17.09".ap-northeast-2.hvm-ebs = "ami-179b3b79"; + "17.09".sa-east-1.hvm-ebs = "ami-4762202b"; + "17.09".ap-south-1.hvm-ebs = "ami-4e376021"; latest = self."17.09"; }; in self diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 75717e08ab2a..2fb38059b261 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -212,7 +212,7 @@ in echo "Obtaining SSH keys..." mkdir -m 0700 -p /root/.ssh AUTH_KEYS=$(${mktemp}) - ${wget} -O $AUTH_KEYS http://metadata.google.internal/computeMetadata/v1/project/attributes/sshKeys + ${wget} -O $AUTH_KEYS --header="Metadata-Flavor: Google" http://metadata.google.internal/computeMetadata/v1/instance/attributes/sshKeys if [ -s $AUTH_KEYS ]; then # Read in key one by one, split in case Google decided |