Branch: refs/heads/master
Home: https://github.com/NixOS/charon
Commit: 3aaef208b7016497fc1bf098ce2a385657c19133
https://github.com/NixOS/charon/commit/3aaef208b7016497fc1bf098ce2a385657c19133
Author: Eelco Dolstra <[email protected]>
Date: 2012-04-13 (Fri, 13 Apr 2012)
Changed paths:
M examples/apache-ec2-multizone.nix
M examples/apache-ec2.nix
M examples/drbd.nix
A examples/ec2-info.nix
M examples/mediawiki-ec2.nix
M examples/terminal-server-ec2.nix
M examples/trivial-ec2-ebs.nix
A examples/trivial-ec2.nix
Log Message:
-----------
Example: move the EC2 key pair / security group settings into a separate file
diff --git a/examples/apache-ec2-multizone.nix
b/examples/apache-ec2-multizone.nix
index 7fe388c..644f930 100644
--- a/examples/apache-ec2-multizone.nix
+++ b/examples/apache-ec2-multizone.nix
@@ -1,19 +1,17 @@
let
configUS =
- { deployment.targetEnv = "ec2";
+ { require = [ ./ec2-info.nix ];
+ deployment.targetEnv = "ec2";
deployment.ec2.region = "us-east-1";
deployment.ec2.instanceType = "m1.large";
- deployment.ec2.keyPair = "eelco";
- deployment.ec2.securityGroups = [ "eelco-test" ];
};
configEU =
- { deployment.targetEnv = "ec2";
+ { require = [ ./ec2-info.nix ];
+ deployment.targetEnv = "ec2";
deployment.ec2.region = "eu-west-1";
deployment.ec2.instanceType = "m1.large";
- deployment.ec2.keyPair = "eelco";
- deployment.ec2.securityGroups = [ "eelco-test" ];
};
in
diff --git a/examples/apache-ec2.nix b/examples/apache-ec2.nix
index d781606..5523669 100644
--- a/examples/apache-ec2.nix
+++ b/examples/apache-ec2.nix
@@ -1,11 +1,10 @@
{
defaults =
{ config, pkgs, ... }:
- { deployment.targetEnv = "ec2";
+ { require = [ ./ec2-info.nix ];
+ deployment.targetEnv = "ec2";
deployment.ec2.region = pkgs.lib.mkDefault "eu-west-1";
deployment.ec2.instanceType = "m1.small";
- deployment.ec2.keyPair = "eelco";
- deployment.ec2.securityGroups = [ "eelco-test" ];
};
backend2.deployment.ec2.region = "us-east-1";
diff --git a/examples/drbd.nix b/examples/drbd.nix
index 919d558..087b557 100644
--- a/examples/drbd.nix
+++ b/examples/drbd.nix
@@ -35,12 +35,10 @@ in {
webserver =
{ pkgs, nodes, ... }:
- {
+ { require = [ ./ec2-info.nix ];
deployment.targetEnv = "ec2";
deployment.ec2.region = "us-east-1";
deployment.ec2.instanceType = "m1.large";
- deployment.ec2.keyPair = "eelco";
- deployment.ec2.securityGroups = [ "eelco-test" ];
services.drbd.enable = true;
services.drbd.config = drbdConf nodes;
jobs.loopUp = loopUp pkgs;
@@ -48,12 +46,10 @@ in {
webserver_failover =
{ pkgs, nodes, ... }:
- {
+ { require = [ ./ec2-info.nix ];
deployment.targetEnv = "ec2";
deployment.ec2.region = "us-east-1";
deployment.ec2.instanceType = "m1.large";
- deployment.ec2.keyPair = "eelco";
- deployment.ec2.securityGroups = [ "eelco-test" ];
services.drbd.enable = true;
services.drbd.config = drbdConf nodes;
jobs.loopUp = loopUp pkgs;
diff --git a/examples/ec2-info.nix b/examples/ec2-info.nix
new file mode 100644
index 0000000..13a5dcc
--- /dev/null
+++ b/examples/ec2-info.nix
@@ -0,0 +1,3 @@
+{ deployment.ec2.keyPair = "eelco";
+ deployment.ec2.securityGroups = [ "eelco-test" ];
+}
diff --git a/examples/mediawiki-ec2.nix b/examples/mediawiki-ec2.nix
index 9bfeaf6..e806665 100644
--- a/examples/mediawiki-ec2.nix
+++ b/examples/mediawiki-ec2.nix
@@ -1,11 +1,10 @@
let
config =
- { deployment.targetEnv = "ec2";
+ { require = [ ./ec2-info.nix ];
+ deployment.targetEnv = "ec2";
deployment.ec2.region = "us-east-1";
deployment.ec2.instanceType = "m1.large";
- deployment.ec2.keyPair = "eelco";
- deployment.ec2.securityGroups = [ "eelco-test" ];
};
in
diff --git a/examples/terminal-server-ec2.nix b/examples/terminal-server-ec2.nix
index 3aee56c..15a6a69 100644
--- a/examples/terminal-server-ec2.nix
+++ b/examples/terminal-server-ec2.nix
@@ -1,10 +1,8 @@
{
machine =
- {
+ { require = [ ./ec2-info.nix ];
deployment.targetEnv = "ec2";
deployment.ec2.region = "us-east-1";
deployment.ec2.instanceType = "m1.large";
- deployment.ec2.keyPair = "eelco";
- deployment.ec2.securityGroups = [ "eelco-test" ];
};
}
diff --git a/examples/trivial-ec2-ebs.nix b/examples/trivial-ec2-ebs.nix
index cbc12b2..7f7fa21 100644
--- a/examples/trivial-ec2-ebs.nix
+++ b/examples/trivial-ec2-ebs.nix
@@ -1,10 +1,9 @@
{
machine =
- { deployment.targetEnv = "ec2";
+ { require = [ ./ec2-info.nix ];
+ deployment.targetEnv = "ec2";
deployment.ec2.region = "eu-west-1";
deployment.ec2.instanceType = "m1.small";
- deployment.ec2.keyPair = "eelco";
- deployment.ec2.securityGroups = [ "eelco-test" ];
deployment.ec2.ebsBoot = true;
fileSystems =
diff --git a/examples/trivial-ec2.nix b/examples/trivial-ec2.nix
new file mode 100644
index 0000000..e97c395
--- /dev/null
+++ b/examples/trivial-ec2.nix
@@ -0,0 +1,8 @@
+{
+ machine =
+ { require = [ ./ec2-info.nix ];
+ deployment.targetEnv = "ec2";
+ deployment.ec2.region = "eu-west-1";
+ deployment.ec2.instanceType = "m1.small";
+ };
+}
\ No newline at end of file
================================================================
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
