Rsync channel redirects to nixos.org
Eelco Dolstra committed
Jan 24, 2019 at 23:33 UTC
4018fb07e9aa4b485d74fb5cdbfc2b5e417ea60b
6 files changed
+18
-15
modules/hydra-mirror-user.nix
new
+9
@@ -0,0 +1,9 @@
1
+{
2
+ users.users.hydra-mirror =
3
+ { description = "Channel mirroring user";
4
+ home = "/home/hydra-mirror";
5
+ isNormalUser = true;
6
+ openssh.authorizedKeys.keys = with import ../ssh-keys.nix; [ eelco rob ];
7
+ uid = 497;
8
+ };
9
+}
modules/hydra-mirror.nix
+1
-7
@@ -33,13 +33,7 @@ let
33
in
34
35
{
36
- users.extraUsers.hydra-mirror =
37
- { description = "Channel mirroring user";
38
- home = "/home/hydra-mirror";
39
- isNormalUser = true;
40
- openssh.authorizedKeys.keys = with import ../ssh-keys.nix; [ eelco rob ];
41
- uid = 497;
42
- };
36
+ imports = [ ./hydra-mirror-user.nix ];
37
38
systemd =
39
fold recursiveUpdate {} [
nixos-org/network.nix
+7
-1
@@ -141,7 +141,13 @@ in
141
142
system.stateVersion = "17.09";
143
144
- imports = [ ./webserver.nix ];
144
+ imports =
145
+ [ ./webserver.nix
146
+ ../modules/hydra-mirror-user.nix
147
+ ];
148
+
149
+ users.users.hydra-mirror.openssh.authorizedKeys.keys =
150
+ [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA/r65Jgp3pe+wNh9Vp64jdTxD9G6Gn5F3sidnydinBK hydra-mirror@bastion" ];
151
};
152
153
}
nixos-org/webserver.nix
-3
@@ -136,7 +136,6 @@ in
136
SSLProtocol All -SSLv2 -SSLv3
137
SSLCipherSuite HIGH:!aNULL:!MD5:!EXP
138
SSLHonorCipherOrder on
139
- #SSLOpenSSLConfCmd DHParameters "${./dhparams.pem}"
139
'';
140
servedDirs =
141
[ { urlPath = "/.well-known/acme-challenge";
@@ -160,7 +159,6 @@ in
159
SSLProtocol All -SSLv2 -SSLv3
160
SSLCipherSuite HIGH:!aNULL:!MD5:!EXP
161
SSLHonorCipherOrder on
163
- #SSLOpenSSLConfCmd DHParameters "${./dhparams.pem}"
162
'';
163
})
164
@@ -179,7 +177,6 @@ in
177
SSLProtocol All -SSLv2 -SSLv3
178
SSLCipherSuite HIGH:!aNULL:!MD5:!EXP
179
SSLHonorCipherOrder on
182
- #SSLOpenSSLConfCmd DHParameters "${./dhparams.pem}"
180
181
# Rewrite HTTP to HTTPS
182
RewriteCond %{HTTPS} off
terraform/nixpkgs-tarballs.tf
+1
@@ -149,6 +149,7 @@ resource "aws_cloudfront_distribution" "nixpkgs-tarballs" {
149
origin_ssl_protocols = ["TLSv1.2"]
150
}
151
}
152
+
153
default_cache_behavior {
154
allowed_methods = ["HEAD", "GET"]
155
cached_methods = ["HEAD", "GET"]
terraform/releases.tf
-4
@@ -1,10 +1,6 @@
1
resource "aws_s3_bucket" "releases" {
2
bucket = "nix-releases"
3
4
- website {
5
- index_document = "index.html"
6
- }
7
-
4
cors_rule {
5
allowed_headers = ["*"]
6
allowed_methods = ["HEAD", "GET"]