Moved to bastion
Eelco Dolstra committed
Jul 5, 2018 at 15:50 UTC
1734cca9ab3a2f03775ca5fbd9e0aaa49b883dce
1 file changed
+10
-5
nixos-org/network.nix
+10
-5
@@ -1,7 +1,7 @@
1
let
2
region = "eu-west-1";
3
zone = "eu-west-1a";
4
- accessKeyId = "lb-nixos";
4
+ accessKeyId = ""; # FIXME
5
in
6
7
{
@@ -219,11 +219,16 @@ in
219
inherit region accessKeyId;
220
vpcId = resources.vpc.nixos-org-vpc;
221
rules =
222
- [ { toPort = 22; fromPort = 22; sourceIp = "213.125.166.74/32"; } # Utrecht office
223
- { toPort = 22; fromPort = 22; sourceIp = "131.180.119.77/32"; } # wendy
224
- { toPort = 80; fromPort = 80; sourceIp = "0.0.0.0/0"; }
222
+ with import ../ip-addresses.nix;
223
+ [ { toPort = 80; fromPort = 80; sourceIp = "0.0.0.0/0"; }
224
{ toPort = 443; fromPort = 443; sourceIp = "0.0.0.0/0"; }
226
- ];
225
+ ]
226
+ ++ map
227
+ (ip: { toPort = 22; fromPort = 22; sourceIp = "${ip}/32"; })
228
+ [ eelcoHome
229
+ eelcoEC2
230
+ "34.254.208.229" # == "bastion.nixos.org"
231
+ ];
232
};
233
234
resources.vpcRouteTables.nixos-org-route-table =