public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix EC2 terminology: zone -> region. (Availability zones are

Browse Source 
something else.)

svn path=/nixos/trunk/; revision=30050
This commit is contained in:
Eelco Dolstra 2011-10-26 23:44:13 +00:00
parent 6e809242e9
commit 564f7358f1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/misc/deployment.nix
View File

@ -60,17 +60,17 @@ let cfg = config.deployment; in
URI of an Amazon EC2-compatible cloud controller web service, URI of an Amazon EC2-compatible cloud controller web service,
used to create and manage virtual machines. If you're using used to create and manage virtual machines. If you're using
EC2, it's more convenient to set EC2, it's more convenient to set
<option>deployment.ec2.zone</option>. <option>deployment.ec2.region</option>.
''; '';
}; };
deployment.ec2.zone = mkOption { deployment.ec2.region = mkOption {
default = ""; default = "";
example = "us-east-1"; example = "us-east-1";
type = types.uniq types.string; type = types.uniq types.string;
description = '' description = ''
Amazon EC2 zone in which the instance is to be deployed. This Amazon EC2 region in which the instance is to be deployed.
option only applies when using EC2. It implicitly sets This option only applies when using EC2. It implicitly sets
<option>deployment.ec2.controller</option> and <option>deployment.ec2.controller</option> and
<option>deployment.ec2.ami</option>. <option>deployment.ec2.ami</option>.
''; '';
@ -183,16 +183,16 @@ let cfg = config.deployment; in
config = { config = {
deployment.ec2 = mkIf (cfg.ec2.zone != "") { deployment.ec2 = mkIf (cfg.ec2.region != "") {
controller = mkDefault "https://ec2.${cfg.ec2.zone}.amazonaws.com/"; controller = mkDefault "https://ec2.${cfg.ec2.region}.amazonaws.com/";
ami = mkDefault ( ami = mkDefault (
if cfg.ec2.zone == "eu-west-1" && config.nixpkgs.system == "i686-linux" then "ami-c9f2d8bd" else if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system == "i686-linux" then "ami-c9f2d8bd" else
if cfg.ec2.zone == "eu-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-c34c71b7" else if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-c34c71b7" else
if cfg.ec2.zone == "us-east-1" && config.nixpkgs.system == "x86_64-linux" then "ami-d93bf4b0" else if cfg.ec2.region == "us-east-1" && config.nixpkgs.system == "x86_64-linux" then "ami-d93bf4b0" else
# !!! Doesn't work, not lazy enough. # !!! Doesn't work, not lazy enough.
# throw "I don't know an AMI for zone ‘${cfg.ec2.zone}’ and platform type ‘${config.nixpkgs.system}’" # throw "I don't know an AMI for region ‘${cfg.ec2.region}’ and platform type ‘${config.nixpkgs.system}’"
""); "");
}; };