* Config for svn.nixos.org and svn.strategoxt.org on SSL.
svn path=/configurations/trunk/tud/; revision=11702
Eelco Dolstra committed
Apr 24, 2008 at 11:43 UTC
0af9266f902c3a93a686848d12e0fa8ad0cc3b71
1 file changed
+31
-9
cartman.nix
+31
-9
@@ -227,9 +227,12 @@ rec {
227
enable = true;
228
experimental = true;
229
logPerVirtualHost = true;
230
- adminAddr = "eelco@cs.uu.nl";
230
+ adminAddr = "e.dolstra@tudelft.nl";
231
hostName = "localhost";
232
233
+ sslServerCert = "/root/ssl-secrets/server.crt";
234
+ sslServerKey = "/root/ssl-secrets/server.key";
235
+
236
extraConfig = ''
237
AddType application/nix-package .nixpkg
238
'';
@@ -273,6 +276,15 @@ rec {
276
];
277
}
278
279
+ # Default vhost for SSL; nothing here yet, but we need it,
280
+ # otherwise SSL requests that don't match with any vhost will
281
+ # go to svn.strategoxt.org.
282
+ { hostName = "buildfarm.st.ewi.tudelft.nl";
283
+ port = 443;
284
+ enableSSL = true;
285
+ globalRedirect = "http://buildfarm.st.ewi.tudelft.nl/";
286
+ }
287
+
288
{ hostName = "strategoxt.org";
289
extraSubservices = [
290
{ function = import /etc/nixos/nixos/upstart-jobs/apache-httpd/twiki.nix;
@@ -283,15 +295,20 @@ rec {
295
296
{ hostName = "www.strategoxt.org";
297
serverAliases = ["www.stratego-language.org"];
286
- extraConfig = ''
287
- RedirectPermanent / http://strategoxt.org/
288
- '';
298
+ globalRedirect = "http://strategoxt.org/";
299
}
300
301
{ hostName = "svn.strategoxt.org";
302
+ globalRedirect = "https://svn.strategoxt.org/";
303
+ }
304
+
305
+ { hostName = "svn.strategoxt.org";
306
+ port = 443;
307
+ enableSSL = true;
308
extraSubservices = [
309
{ function = import /etc/nixos/nixos/upstart-jobs/apache-httpd/subversion.nix;
310
config = {
311
+ id = "strategoxt";
312
urlPrefix = "";
313
dataDir = "/data/subversion-strategoxt";
314
notificationSender = "root@buildfarm.st.ewi.tudelft.nl";
@@ -299,7 +316,7 @@ rec {
316
organisation = {
317
name = "Stratego/XT";
318
url = http://strategoxt.org/;
302
- logo = "http://strategoxt.org/pub/Stratego/StrategoLogo/StrategoLogoTextlessWhite-100px.png";
319
+ logo = http://strategoxt.org/pub/Stratego/StrategoLogo/StrategoLogoTextlessWhite-100px.png;
320
};
321
};
322
}
@@ -346,15 +363,16 @@ rec {
363
}
364
365
{ hostName = "www.nixos.org";
349
- extraConfig = ''
350
- RedirectPermanent / http://nixos.org/
351
- '';
366
+ globalRedirect = "http://nixos.org/";
367
}
368
369
{ hostName = "svn.nixos.org";
370
+ port = 443;
371
+ enableSSL = true;
372
extraSubservices = [
373
{ function = import /etc/nixos/nixos/upstart-jobs/apache-httpd/subversion.nix;
374
config = {
375
+ id = "nix";
376
urlPrefix = "";
377
dataDir = "/data/subversion-nix";
378
notificationSender = "root@buildfarm.st.ewi.tudelft.nl";
@@ -362,13 +380,17 @@ rec {
380
organisation = {
381
name = "Nix";
382
url = http://nixos.org/;
365
- logo = "http://www.st.ewi.tudelft.nl/serg-logo.png"; # !!! need a logo
383
+ logo = http://subversion.tigris.org/images/subversion_logo_hor-468x64.png; # !!! need a logo
384
};
385
};
386
}
387
];
388
}
389
390
+ { hostName = "svn.nixos.org";
391
+ globalRedirect = "https://svn.nixos.org/";
392
+ }
393
+
394
{ hostName = "planet.strategoxt.org";
395
serverAliases = ["planet.stratego.org"];
396
documentRoot = "/home/karltk/public_html/planet";