Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make additional AWS keys and values obviously bogus #808

Merged
merged 1 commit into from
Dec 10, 2017
Merged

Make additional AWS keys and values obviously bogus #808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions doc/manual/nixops.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,8 @@ cloud.</para>
<literal>#</literal> are stripped. An example:

<programlisting>
AKIAIUTDLWJKSLSJDLDQ Grsjf37cDKKWndklek3jdxnSKE3fkskDLqdldDl/ dev # AWS development account
AKIAEODJSLXMDLLJKDLW DLeodsk32kldlDLSKdflexfpgiklf130r4dl23qp prod # AWS production account
AKIABOGUSACCESSKEY BOGUSSECRETACCESSKEY dev # AWS development account
AKIABOGUSPRODACCESSKEY BOGUSPRODSECRETACCESSKEY prod # AWS production account
</programlisting>

The identifier can be used instead of actual Access Key IDs in
Expand Down Expand Up @@ -334,12 +334,12 @@ deployment.ec2.accessKeyId = "prod";

<programlisting>
[dev]
aws_access_key_id = AKIAIUTDLWJKS.....DQ
aws_secret_access_key = Grsjf37cDKKWndklek3jdxnSK............Dl/
aws_access_key_id = AKIABOGUSACCESSKEY
aws_secret_access_key = BOGUSSECRETACCESSKEY

[prod]
aws_access_key_id = AKIAEODJSLXMD.....LW
aws_secret_access_key = DLeodsk32kldlDLSKdflexfpg............3qp
aws_access_key_id = AKIABOGUSPRODACCESSKEY
aws_secret_access_key = BOGUSPRODSECRETACCESSKEY
</programlisting>

Symbolic profile names are specified in
Expand Down
16 changes: 8 additions & 8 deletions nix/ec2.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ let

disk = mkOption {
default = "";
example = "vol-d04895b8";
example = "vol-00000000";
type = types.either types.str (resource "ebs-volume");
apply = x: if builtins.isString x then x else "res-" + x._name;
description = ''
EC2 identifier of the disk to be mounted. This can be an
ephemeral disk (e.g. <literal>ephemeral0</literal>), a
snapshot ID (e.g. <literal>snap-1cbda474</literal>) or a
volume ID (e.g. <literal>vol-d04895b8</literal>). Leave
snapshot ID (e.g. <literal>snap-00000000</literal>) or a
volume ID (e.g. <literal>vol-00000000</literal>). Leave
empty to create an EBS volume automatically. It can also be
an EBS resource (e.g. <literal>resources.ebsVolumes.big-disk</literal>).
'';
Expand Down Expand Up @@ -164,7 +164,7 @@ in

deployment.ec2.accessKeyId = mkOption {
default = "";
example = "AKIAIEMEJZVMPOHZWKZQ";
example = "AKIABOGUSACCESSKEY";
type = types.str;
description = ''
The AWS Access Key ID. If left empty, it defaults to the
Expand Down Expand Up @@ -228,7 +228,7 @@ in
};

deployment.ec2.ami = mkOption {
example = "ami-ecb49e98";
example = "ami-00000000";
type = types.str;
description = ''
EC2 identifier of the AMI disk image used in the virtual
Expand Down Expand Up @@ -313,7 +313,7 @@ in

deployment.ec2.subnetId = mkOption {
default = "";
example = "subnet-9d4a7b6c";
example = "subnet-00000000";
type = types.str;
description = ''
The subnet inside a VPC to launch the instance in.
Expand Down Expand Up @@ -354,7 +354,7 @@ in

deployment.ec2.blockDeviceMapping = mkOption {
default = { };
example = { "/dev/xvdb".disk = "ephemeral0"; "/dev/xvdg".disk = "vol-d04895b8"; };
example = { "/dev/xvdb".disk = "ephemeral0"; "/dev/xvdg".disk = "vol-00000000"; };
type = with types; attrsOf (submodule ec2DiskOptions);
description = ''
Block device mapping. <filename>/dev/xvd[a-e]</filename> must be ephemeral devices.
Expand All @@ -363,7 +363,7 @@ in

deployment.ec2.elasticIPv4 = mkOption {
default = "";
example = "203.0.113.123";
example = "123.1.123.123";
type = types.either types.str (resource "elastic-ip");
apply = x: if builtins.isString x then x else "res-" + x._name;
description = ''
Expand Down
2 changes: 1 addition & 1 deletion nix/route53.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ with lib;

deployment.route53.accessKeyId = mkOption {
default = "";
example = "AKIAIEMEJZVMPOHZWKZQ";
example = "AKIABOGUSACCESSKEY";
type = types.str;
description = ''
The AWS Access Key ID. If left empty, it defaults to the
Expand Down