From 564f7358f1ddd561bc4c6ac350bd0c184fc3824a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 26 Oct 2011 23:44:13 +0000
Subject: [PATCH] * Fix EC2 terminology: zone -> region.  (Availability zones
 are   something else.)

svn path=/nixos/trunk/; revision=30050
---
 modules/misc/deployment.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/misc/deployment.nix b/modules/misc/deployment.nix
index de8f72836fdd..81988e964681 100644
--- a/modules/misc/deployment.nix
+++ b/modules/misc/deployment.nix
@@ -60,17 +60,17 @@ let cfg = config.deployment; in
         URI of an Amazon EC2-compatible cloud controller web service,
         used to create and manage virtual machines.  If you're using
         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 = "";
       example = "us-east-1";
       type = types.uniq types.string;
       description = ''
-        Amazon EC2 zone in which the instance is to be deployed.  This
-        option only applies when using EC2.  It implicitly sets
+        Amazon EC2 region in which the instance is to be deployed.
+        This option only applies when using EC2.  It implicitly sets
         <option>deployment.ec2.controller</option> and
         <option>deployment.ec2.ami</option>.
       '';
@@ -183,16 +183,16 @@ let cfg = config.deployment; in
 
   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 (
-        if cfg.ec2.zone == "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.zone == "us-east-1" && config.nixpkgs.system == "x86_64-linux" then "ami-d93bf4b0" else
+        if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system == "i686-linux" then "ami-c9f2d8bd" else
+        if cfg.ec2.region == "eu-west-1" && config.nixpkgs.system == "x86_64-linux" then "ami-c34c71b7" else
+        if cfg.ec2.region == "us-east-1" && config.nixpkgs.system == "x86_64-linux" then "ami-d93bf4b0" else
         # !!! 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}’"
         "");
         
     };