Fix ACME and redirect http://planet to https://planet
Eelco Dolstra committed
Aug 31, 2017 at 16:48 UTC
9eb10cfb7728e50fda818ddb045bfdbedf9a440d
1 file changed
+8
-5
nixos-org/webserver.nix
+8
-5
@@ -25,7 +25,7 @@ let
25
dir = "/releases";
26
}
27
{ urlPath = "/.well-known/acme-challenge";
28
- dir = "${acmeWebRoot}/nixos.org/.well-known/acme-challenge";
28
+ dir = "${acmeWebRoot}/.well-known/acme-challenge";
29
}
30
];
31
@@ -158,6 +158,10 @@ in
158
];
159
}
160
161
+ { hostName = "planet.nixos.org";
162
+ globalRedirect = "https://planet.nixos.org/";
163
+ }
164
+
165
{ hostName = "planet.nixos.org";
166
documentRoot = "/var/www/planet.nixos.org";
167
enableSSL = true;
@@ -179,7 +183,7 @@ in
183
184
servedDirs =
185
[ { urlPath = "/.well-known/acme-challenge";
182
- dir = "${acmeWebRoot}/planet.nixos.org/.well-known/acme-challenge";
186
+ dir = "${acmeWebRoot}/.well-known/acme-challenge";
187
}
188
];
189
}
@@ -255,17 +259,16 @@ in
259
security.acme.certs = {
260
"nixos.org" =
261
{ email = "edolstra@gmail.com";
258
- webroot = "${acmeWebRoot}/nixos.org";
262
+ webroot = "${acmeWebRoot}";
263
postRun = "systemctl reload httpd.service";
264
};
265
"planet.nixos.org" =
266
{ email = "edolstra@gmail.com";
263
- webroot = "${acmeWebRoot}/planet.nixos.org";
267
+ webroot = "${acmeWebRoot}";
268
postRun = "systemctl reload httpd.service";
269
};
270
};
271
268
-
272
# Generate a dummy self-signed certificate until we get one from
273
# Let's Encrypt.
274
system.activationScripts.createDummyKey =