delft: Update to 20.03
Eelco Dolstra committed
Mar 31, 2020 at 13:42 UTC
1592f384ebbf61f990ab9f9b707423842e3f7c18
3 files changed
+16
-17
delft/common.nix
+2
@@ -93,4 +93,6 @@ with lib;
93
94
# Disable sending email from cron.
95
services.cron.mailto = "";
96
+
97
+ documentation.nixos.enable = false;
98
}
delft/flake.nix
+2
-2
@@ -1,8 +1,8 @@
1
{
2
edition = 201909;
3
4
- #inputs.nixpkgs.uri = "/home/deploy/src/edolstra-nixpkgs"; # toString ../../edolstra-nixpkgs; # = "nixpkgs/release-19.09";
5
- inputs.nixpkgs.uri = "nixpkgs/release-19.09";
4
+ #inputs.nixpkgs.url = "/home/deploy/src/edolstra-nixpkgs"; # toString ../../edolstra-nixpkgs; # = "nixpkgs/release-19.09";
5
+ inputs.nixpkgs.url = "nixpkgs/nixos-20.03";
6
7
outputs = flakes @ { self, nixpkgs, nix, hydra, dwarffs }: {
8
delft/hydra-proxy.nix
+12
-15
@@ -40,7 +40,6 @@ in
40
services.httpd = {
41
enable = true;
42
adminAddr = "edolstra@gmail.com";
43
- hostName = "hydra.nixos.org";
43
logFormat = ''"%h %l %u %t \"%r\" %>s %b %D"'';
44
extraConfig = hydraProxyConfig +
45
''
@@ -49,18 +48,8 @@ in
48
RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301,L]
49
'';
50
52
- servedDirs =
53
- [ { urlPath = "/apache-errors";
54
- dir = ./apache-errors;
55
- }
56
- { urlPath = "/.well-known/acme-challenge";
57
- dir = "${acmeWebRoot}/.well-known/acme-challenge";
58
- }
59
- ];
60
-
61
- virtualHosts = [
62
- { hostName = "hydra.nixos.org";
63
- enableSSL = true;
51
+ virtualHosts."hydra.nixos.org" =
52
+ { addSSL = true;
53
sslServerKey = "${acmeKeyDir}/key.pem";
54
sslServerCert = "${acmeKeyDir}/fullchain.pem";
55
extraConfig = ''
@@ -69,12 +58,20 @@ in
58
RequestHeader set X-Forwarded-Port 443
59
Header always set Strict-Transport-Security "max-age=15552000"
60
'';
72
- }
73
- ];
61
+ servedDirs =
62
+ [ { urlPath = "/apache-errors";
63
+ dir = ./apache-errors;
64
+ }
65
+ { urlPath = "/.well-known/acme-challenge";
66
+ dir = "${acmeWebRoot}/.well-known/acme-challenge";
67
+ }
68
+ ];
69
+ };
70
71
};
72
73
# Let's Encrypt configuration.
74
+ security.acme.acceptTerms = true;
75
security.acme.certs."hydra.nixos.org" =
76
{ email = "edolstra@gmail.com";
77
webroot = acmeWebRoot;