@cryptotaxi247 / infra-1 / commits / 96a879c5

Update SSL paths

Eelco Dolstra committed Jul 1, 2015 at 10:50 UTC 96a879c5a345dc068923bf011cfa505092d74039
1 file changed +5 -6
delft/delft-webserver.nix
+5 -6
@@ -46,12 +46,11 @@ let
46
47 strategoxtSSLConfig =
48 { enableSSL = true;
49 - sslServerCert = "/root/ssl-secrets/ssl-strategoxt-org.crt";
50 - sslServerKey = "/root/ssl-secrets/ssl-strategoxt-org.key";
49 + sslServerCert = "/root/ssl-secrets/ssl-strategoxt.org.crt";
50 + sslServerKey = "/root/ssl-secrets/ssl-strategoxt.org.key";
51 extraConfig =
52 ''
53 - SSLCertificateChainFile /root/ssl-secrets/startssl-class1.pem
54 - SSLCACertificateFile /root/ssl-secrets/startssl-ca.pem
53 + SSLCertificateChainFile ${../nixos-org/sub.class1.server.ca.pem}
54 '';
55 };
56
@@ -239,8 +238,8 @@ in
238 { hostName = "hydra.nixos.org";
239
240 enableSSL = true;
242 - sslServerCert = "/root/ssl-secrets/ssl-nixos-org.crt";
243 - sslServerKey = "/root/ssl-secrets/ssl-nixos-org.key";
241 + sslServerCert = "/root/ssl-secrets/ssl-nixos.org.crt";
242 + sslServerKey = "/root/ssl-secrets/ssl-nixos.org.key";
243
244 logFormat = ''"%h %l %u %t \"%r\" %>s %b %D"'';
245 extraConfig = ''