summary refs log tree commit diff
path: root/nixos/maintainers/scripts
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-12-30 18:19:52 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-12-30 18:32:45 +0100
commit512d788a687180c4c354c60582c5bec0832bdc60 (patch)
treea338359c8d6292acf06b5a52f927ec312dc83dd1 /nixos/maintainers/scripts
parentadf62ba9c17285a498467e83a19243e52dfc36d3 (diff)
downloadnixpkgs-512d788a687180c4c354c60582c5bec0832bdc60.tar
nixpkgs-512d788a687180c4c354c60582c5bec0832bdc60.tar.gz
nixpkgs-512d788a687180c4c354c60582c5bec0832bdc60.tar.bz2
nixpkgs-512d788a687180c4c354c60582c5bec0832bdc60.tar.lz
nixpkgs-512d788a687180c4c354c60582c5bec0832bdc60.tar.xz
nixpkgs-512d788a687180c4c354c60582c5bec0832bdc60.tar.zst
nixpkgs-512d788a687180c4c354c60582c5bec0832bdc60.zip
Create AMIs in the lb-nixos account
Diffstat (limited to 'nixos/maintainers/scripts')
-rwxr-xr-xnixos/maintainers/scripts/ec2/create-ebs-amis.py10
-rw-r--r--nixos/maintainers/scripts/ec2/ebs-creator.nix3
2 files changed, 6 insertions, 7 deletions
diff --git a/nixos/maintainers/scripts/ec2/create-ebs-amis.py b/nixos/maintainers/scripts/ec2/create-ebs-amis.py
index 6c91aa68694..8c686139fef 100755
--- a/nixos/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/nixos/maintainers/scripts/ec2/create-ebs-amis.py
@@ -34,13 +34,13 @@ ebs_size = 20
 # Start a NixOS machine in the given region.
 f = open("ebs-creator-config.nix", "w")
 f.write('''{{
-  resources.ec2KeyPairs.keypair.accessKeyId = "logicblox-dev";
+  resources.ec2KeyPairs.keypair.accessKeyId = "lb-nixos";
   resources.ec2KeyPairs.keypair.region = "{0}";
 
   machine =
     {{ pkgs, ... }}:
     {{
-      deployment.ec2.accessKeyId = "logicblox-dev";
+      deployment.ec2.accessKeyId = "lb-nixos";
       deployment.ec2.region = "{0}";
       deployment.ec2.blockDeviceMapping."/dev/xvdg".size = pkgs.lib.mkOverride 10 {1};
     }};
@@ -161,16 +161,16 @@ f.write(
     {{
       network.description = "NixOS EBS test";
 
-      resources.ec2KeyPairs.keypair.accessKeyId = "logicblox-dev";
+      resources.ec2KeyPairs.keypair.accessKeyId = "lb-nixos";
       resources.ec2KeyPairs.keypair.region = "{0}";
 
       machine = {{ config, pkgs, resources, ... }}: {{
         deployment.targetEnv = "ec2";
-        deployment.ec2.accessKeyId = "logicblox-dev";
+        deployment.ec2.accessKeyId = "lb-nixos";
         deployment.ec2.region = "{0}";
         deployment.ec2.instanceType = "{2}";
         deployment.ec2.keyPair = resources.ec2KeyPairs.keypair.name;
-        deployment.ec2.securityGroups = [ "admin" ];
+        deployment.ec2.securityGroups = [ "public-ssh" ];
         deployment.ec2.ami = "{1}";
       }};
     }}
diff --git a/nixos/maintainers/scripts/ec2/ebs-creator.nix b/nixos/maintainers/scripts/ec2/ebs-creator.nix
index 37795d5d5b4..7bb13695fa7 100644
--- a/nixos/maintainers/scripts/ec2/ebs-creator.nix
+++ b/nixos/maintainers/scripts/ec2/ebs-creator.nix
@@ -5,10 +5,9 @@
     { config, pkgs, resources, ... }:
     { deployment.targetEnv = "ec2";
       deployment.ec2.instanceType = "c3.large";
-      deployment.ec2.securityGroups = [ "admin" ];
+      deployment.ec2.securityGroups = [ "public-ssh" ];
       deployment.ec2.ebsBoot = false;
       deployment.ec2.keyPair = resources.ec2KeyPairs.keypair.name;
-      deployment.ec2.zone = "us-east-1e";
       environment.systemPackages = [ pkgs.parted ];
     };
 }