* Enable https on strategoxt.org.
svn path=/configurations/trunk/tud/; revision=34651
Eelco Dolstra committed
Nov 23, 2012 at 14:49 UTC
194464c2b86b0c74cb709619cdf565bf5a8d5510
1 file changed
+32
-25
cartman.nix
+32
-25
@@ -132,7 +132,35 @@ let
132
];
133
};
134
135
+ strategoxtVHostConfig =
136
+ { hostName = "strategoxt.org";
137
+ servedFiles = [
138
+ { urlPath = "/freenode.ver";
139
+ file = "/data/pt-wiki/pub/freenode.ver";
140
+ }
141
+ ];
142
+ extraSubservices = [
143
+ { function = import /etc/nixos/services/twiki;
144
+ startWeb = "Stratego/WebHome";
145
+ dataDir = "/data/pt-wiki/data";
146
+ pubDir = "/data/pt-wiki/pub";
147
+ twikiName = "Stratego/XT Wiki";
148
+ registrationDomain = "ewi.tudelft.nl";
149
+ }
150
+ ];
151
+ };
152
153
+ strategoxtSSLConfig =
154
+ { enableSSL = true;
155
+ sslServerCert = "/root/ssl-secrets/ssl-strategoxt-org.crt";
156
+ sslServerKey = "/root/ssl-secrets/ssl-strategoxt-org.key";
157
+ extraConfig =
158
+ ''
159
+ SSLCertificateChainFile /root/ssl-secrets/startssl-class1.pem
160
+ SSLCACertificateFile /root/ssl-secrets/startssl-ca.pem
161
+ '';
162
+ };
163
+
164
in
165
166
rec {
@@ -400,23 +428,9 @@ rec {
428
];
429
}
430
403
- { hostName = "strategoxt.org";
404
- servedFiles = [
405
- { urlPath = "/freenode.ver";
406
- file = "/data/pt-wiki/pub/freenode.ver";
407
- }
408
- ] ;
431
+ strategoxtVHostConfig
432
410
- extraSubservices = [
411
- { function = import /etc/nixos/services/twiki;
412
- startWeb = "Stratego/WebHome";
413
- dataDir = "/data/pt-wiki/data";
414
- pubDir = "/data/pt-wiki/pub";
415
- twikiName = "Stratego/XT Wiki";
416
- registrationDomain = "ewi.tudelft.nl";
417
- }
418
- ];
419
- }
433
+ (strategoxtVHostConfig // strategoxtSSLConfig)
434
435
{ hostName = "www.strategoxt.org";
436
serverAliases = ["www.stratego-language.org"];
@@ -427,15 +441,8 @@ rec {
441
globalRedirect = "https://svn.strategoxt.org/";
442
}
443
444
+ ( strategoxtSSLConfig //
445
{ hostName = "svn.strategoxt.org";
431
- enableSSL = true;
432
- sslServerCert = "/root/ssl-secrets/ssl-strategoxt-org.crt";
433
- sslServerKey = "/root/ssl-secrets/ssl-strategoxt-org.key";
434
- extraConfig =
435
- ''
436
- SSLCertificateChainFile /root/ssl-secrets/startssl-class1.pem
437
- SSLCACertificateFile /root/ssl-secrets/startssl-ca.pem
438
- '';
446
extraSubservices = [
447
{ function = import /etc/nixos/services/subversion;
448
id = "strategoxt";
@@ -449,7 +456,7 @@ rec {
456
};
457
}
458
];
452
- }
459
+ })
460
461
{ hostName = "program-transformation.org";
462
serverAliases = ["www.program-transformation.org"];