Moved tarballs mirror to S3
Eelco Dolstra committed
Dec 17, 2015 at 15:00 UTC
94b38f6861dfbc0c4ed7c4e10ee8dee483112fcd
2 files changed
+28
-24
nixos-org/network.nix
+24
-15
@@ -7,13 +7,7 @@ in
7
{
8
network.description = "NixOS.org Infrastructure";
9
10
- resources.ebsVolumes.tarballs =
11
- { tags.Name = "Nixpkgs source tarball mirror";
12
- inherit region zone accessKeyId;
13
- size = 100;
14
- };
15
-
16
- resources.ebsVolumes.releases2 =
10
+ resources.ebsVolumes.releases =
11
{ tags.Name = "Nix/Nixpkgs/NixOS releases";
12
inherit region zone accessKeyId;
13
size = 1024;
@@ -33,6 +27,28 @@ in
27
{ inherit region accessKeyId;
28
};
29
30
+ resources.s3Buckets.nixpkgs-tarballs =
31
+ { config, ... }:
32
+ { inherit region accessKeyId;
33
+ name = "nixpkgs-tarballs";
34
+ # All files are readable but not listable.
35
+ policy =
36
+ ''
37
+ {
38
+ "Version": "2008-10-17",
39
+ "Statement": [
40
+ {
41
+ "Sid": "AllowPublicRead",
42
+ "Effect": "Allow",
43
+ "Principal": {"AWS": "*"},
44
+ "Action": ["s3:GetObject"],
45
+ "Resource": ["${config.arn}/*"]
46
+ }
47
+ ]
48
+ }
49
+ '';
50
+ };
51
+
52
webserver =
53
{ config, pkgs, resources, ... }:
54
@@ -47,18 +63,11 @@ in
63
deployment.ec2.securityGroups = [ "public-web" "public-ssh" ];
64
deployment.ec2.elasticIPv4 = resources.elasticIPs."nixos.org";
65
50
- fileSystems."/tarballs" =
51
- { autoFormat = true;
52
- fsType = "ext4";
53
- device = "/dev/xvdf";
54
- ec2.disk = resources.ebsVolumes.tarballs;
55
- };
56
-
66
fileSystems."/releases" =
67
{ autoFormat = true;
68
fsType = "ext4";
69
device = "/dev/xvdj";
61
- ec2.disk = resources.ebsVolumes.releases2;
70
+ ec2.disk = resources.ebsVolumes.releases;
71
};
72
73
fileSystems."/data" =
nixos-org/webserver.nix
+4
-9
@@ -85,6 +85,8 @@ in
85
86
environment.systemPackages = [ pkgs.perlPackages.XMLSimple pkgs.git pkgs.openssl ];
87
88
+ nix.nixPath = [ "nixpkgs=https://nixos.org/channels/nixos-15.09-small/nixexprs.tar.xz" ];
89
+
90
security.pam.enableSSHAgentAuth = true;
91
92
services.httpd = {
@@ -197,15 +199,6 @@ in
199
];
200
})
201
200
- { hostName = "tarballs.nixos.org";
201
- serverAliases = [ "tarballs-uncached.nixos.org" ];
202
- documentRoot = "/tarballs";
203
- extraConfig =
204
- ''
205
- UseCanonicalName on
206
- '';
207
- }
208
-
202
{ hostName = "releases.nixos.org";
203
serverAliases = [ "releases-uncached.nixos.org" ];
204
extraConfig =
@@ -294,6 +287,7 @@ in
287
];
288
};
289
290
+ /*
291
systemd.services.mirror-tarballs =
292
{ description = "Mirror Nixpkgs Tarballs";
293
path = [ config.nix.package pkgs.curl pkgs.git ];
@@ -315,6 +309,7 @@ in
309
'';
310
startAt = "05:30";
311
};
312
+ */
313
314
systemd.services.update-channels =
315
{ description = "Update Channels";