* Move svn.nixos.org and wiki.nixos.org to nixos.org, mostly so that those sites can use https with a proper certificate.
* Move svn.nixos.org and wiki.nixos.org to nixos.org, mostly so that those sites can use https with a proper certificate. svn path=/configurations/trunk/tud/; revision=29663
Eelco Dolstra committed
Oct 5, 2011 at 15:30 UTC
39e0cd15ed78cf4ea1f5904d8d1cc4c5dfee2b45
1 file changed
+97
-83
cartman.nix
+97
-83
@@ -25,6 +25,78 @@ let
25
rev = 94;
26
};
27
28
+ nixosVHostConfig =
29
+ { hostName = "nixos.org";
30
+ serverAliases = [ "ipv6.nixos.org" ];
31
+ documentRoot = "/home/eelco/nix-homepage";
32
+ servedDirs =
33
+ [ { urlPath = "/tarballs";
34
+ dir = "/data/webserver/tarballs";
35
+ }
36
+ { urlPath = "/irc";
37
+ dir = "/data/webserver/irc";
38
+ }
39
+ { urlPath = "/update";
40
+ dir = "/data/webserver/update";
41
+ }
42
+ { urlPath = "/releases";
43
+ dir = "/data/releases";
44
+ }
45
+ ];
46
+
47
+ servedFiles =
48
+ [ { urlPath = "/releases/css/releases.css";
49
+ file = releasesCSS;
50
+ }
51
+ ];
52
+
53
+ extraConfig =
54
+ ''
55
+ <Proxy *>
56
+ Order deny,allow
57
+ Allow from all
58
+ </Proxy>
59
+
60
+ ProxyPreserveHost On
61
+
62
+ ProxyPass /mturk http://wendy:3000/mturk retry=5
63
+ ProxyPassReverse /mturk http://wendy:3000/mturk
64
+ ProxyPass /mturk-sandbox http://wendy:3001/mturk-sandbox retry=5
65
+ ProxyPassReverse /mturk-sandbox http://wendy:3001/mturk-sandbox
66
+ '';
67
+
68
+ extraSubservices =
69
+ [ { function = import /etc/nixos/services/subversion;
70
+ id = "nix";
71
+ urlPrefix = "";
72
+ toplevelRedirect = false;
73
+ dataDir = "/data/subversion-nix";
74
+ notificationSender = "svn@svn.nixos.org";
75
+ userCreationDomain = "st.ewi.tudelft.nl";
76
+ organisation = {
77
+ name = "Nix";
78
+ url = http://nixos.org/;
79
+ logo = "/logo/nixos-lores.png";
80
+ };
81
+ }
82
+ { serviceType = "mediawiki";
83
+ siteName = "Nix Wiki";
84
+ logo = "/logo/nix-wiki.png";
85
+ defaultSkin = "nixos";
86
+ extraConfig =
87
+ ''
88
+ $wgEmailConfirmToEdit = true;
89
+ '';
90
+ enableUploads = true;
91
+ uploadDir = "/data/nixos-mediawiki-upload";
92
+ dbServer = "webdsl.org";
93
+ dbUser = "mediawiki";
94
+ dbPassword = import ./mediawiki-password.nix;
95
+ }
96
+ ];
97
+ };
98
+
99
+
100
in
101
102
rec {
@@ -204,6 +276,19 @@ rec {
276
globalRedirect = "http://nixos.org/";
277
}
278
279
+ nixosVHostConfig
280
+
281
+ (nixosVHostConfig // {
282
+ enableSSL = true;
283
+ sslServerCert = "/root/ssl-secrets/ssl-nixos-org.crt";
284
+ sslServerKey = "/root/ssl-secrets/ssl-nixos-org.key";
285
+ extraConfig = nixosVHostConfig.extraConfig +
286
+ ''
287
+ SSLCertificateChainFile /root/ssl-secrets/startssl-class1.pem
288
+ SSLCACertificateFile /root/ssl-secrets/startssl-ca.pem
289
+ '';
290
+ })
291
+
292
{ hostName = "buildfarm.st.ewi.tudelft.nl";
293
documentRoot = cleanSource ./webroot;
294
enableUserDir = true;
@@ -325,71 +410,6 @@ rec {
410
documentRoot = "/data/webserver/dist/strategoxt2";
411
}
412
328
- { hostName = "ssl.nixos.org";
329
- serverAliases = [ "ipv6.nixos.org" ];
330
- documentRoot = "/home/eelco/nix-homepage";
331
- enableSSL = true;
332
- sslServerCert = "/root/ssl-secrets/ssl-nixos-org.crt";
333
- sslServerKey = "/root/ssl-secrets/ssl-nixos-org.key";
334
- extraConfig =
335
- ''
336
- SSLCertificateChainFile /root/ssl-secrets/startssl-class1.pem
337
- SSLCACertificateFile /root/ssl-secrets/startssl-ca.pem
338
- '';
339
- extraSubservices = [
340
- { function = import /etc/nixos/services/subversion;
341
- id = "nix";
342
- urlPrefix = "";
343
- toplevelRedirect = false;
344
- dataDir = "/data/subversion-nix";
345
- notificationSender = "svn@svn.nixos.org";
346
- userCreationDomain = "st.ewi.tudelft.nl";
347
- organisation = {
348
- name = "Nix";
349
- url = http://nixos.org/;
350
- logo = http://nixos.org/logo/nixos-lores.png;
351
- };
352
- }
353
- ];
354
- }
355
-
356
- { hostName = "nixos.org";
357
- serverAliases = [ "ipv6.nixos.org" ];
358
- documentRoot = "/home/eelco/nix-homepage";
359
- servedDirs = [
360
- { urlPath = "/tarballs";
361
- dir = "/data/webserver/tarballs";
362
- }
363
- { urlPath = "/irc";
364
- dir = "/data/webserver/irc";
365
- }
366
- { urlPath = "/update";
367
- dir = "/data/webserver/update";
368
- }
369
- { urlPath = "/releases";
370
- dir = "/data/releases";
371
- }
372
- ];
373
-
374
- servedFiles = [
375
- { urlPath = "/releases/css/releases.css";
376
- file = releasesCSS;
377
- }
378
- ];
379
-
380
- extraConfig = ''
381
- <Proxy *>
382
- Order deny,allow
383
- Allow from all
384
- </Proxy>
385
-
386
- ProxyPass /mturk http://wendy:3000/mturk retry=5
387
- ProxyPassReverse /mturk http://wendy:3000/mturk
388
- ProxyPass /mturk-sandbox http://wendy:3001/mturk-sandbox retry=5
389
- ProxyPassReverse /mturk-sandbox http://wendy:3001/mturk-sandbox
390
- '';
391
- }
392
-
413
{ hostName = "syntax-definition.org";
414
serverAliases = ["www.syntax-definition.org"];
415
extraSubservices = [
@@ -403,6 +423,10 @@ rec {
423
];
424
}
425
426
+ # Obsolete, kept for backwards compatibility. Replace this
427
+ # with a global redirect once Subversion 1.7 has been out for
428
+ # a while
429
+ # (http://subversion.tigris.org/issues/show_bug.cgi?id=2779).
430
{ hostName = "svn.nixos.org";
431
enableSSL = true;
432
sslServerCert = "/root/ssl-secrets/server.crt";
@@ -421,10 +445,14 @@ rec {
445
};
446
}
447
];
448
+ extraConfig = ''
449
+ RedirectMatch ^/$ https://nixos.org/repoman
450
+ '';
451
}
452
453
+ # Obsolete, kept for backwards compatibility.
454
{ hostName = "svn.nixos.org";
427
- globalRedirect = "https://svn.nixos.org/";
455
+ globalRedirect = "https://nixos.org/svn";
456
}
457
458
{ hostName = "hydra.nixos.org";
@@ -464,26 +492,12 @@ rec {
492
'';
493
}
494
495
+ # Obsolete, kept for backwards compatibility.
496
{ hostName = "wiki.nixos.org";
497
extraConfig = ''
469
- RedirectMatch ^/$ /wiki
498
+ RedirectMatch ^/$ https://nixos.org/wiki
499
+ Redirect / https://nixos.org/
500
'';
471
- extraSubservices = [
472
- { serviceType = "mediawiki";
473
- siteName = "Nix Wiki";
474
- logo = "http://nixos.org/logo/nix-wiki.png";
475
- defaultSkin = "nixos";
476
- extraConfig =
477
- ''
478
- $wgEmailConfirmToEdit = true;
479
- '';
480
- enableUploads = true;
481
- uploadDir = "/data/nixos-mediawiki-upload";
482
- dbServer = "webdsl.org";
483
- dbUser = "mediawiki";
484
- dbPassword = import ./mediawiki-password.nix;
485
- }
486
- ];
501
}
502
503
{ hostName = "planet.strategoxt.org";