svn path=/configurations/trunk/tud/; revision=31864
svn path=/configurations/trunk/tud/; revision=31864
Eelco Dolstra committed
Jan 26, 2012 at 15:40 UTC
d165520fcb350568c634a54389ab5aaf3dfaeba4
1 file changed
+14
-33
cartman.nix
+14
-33
@@ -141,6 +141,8 @@ rec {
141
}
142
];
143
144
+ useDHCP = false;
145
+
146
defaultGateway = "130.161.158.1";
147
148
nameservers = [ "127.0.0.1" ];
@@ -167,7 +169,7 @@ rec {
169
${pkgs.iptables}/sbin/iptables -t nat -F PREROUTING
170
171
# lucifer ssh (to give Karl/Armijn access for the BAT project)
170
- ${pkgs.iptables}/sbin/iptables -t nat -A PREROUTING -p tcp -d ${myIP} --dport 5950 -j DNAT --to 192.168.1.26:22
172
+ ${pkgs.iptables}/sbin/iptables -t nat -A PREROUTING -p tcp -d ${myIP} --dport 2222 -j DNAT --to 192.168.1.26:22
173
174
# Cleanup.
175
ip -6 route flush dev sixxs
@@ -333,16 +335,6 @@ rec {
335
];
336
}
337
336
- # Default vhost for SSL; nothing here yet, but we need it,
337
- # otherwise SSL requests that don't match with any vhost will
338
- # go to svn.strategoxt.org.
339
- { hostName = "buildfarm.st.ewi.tudelft.nl";
340
- enableSSL = true;
341
- sslServerCert = "/root/ssl-secrets/server.crt";
342
- sslServerKey = "/root/ssl-secrets/server.key";
343
- globalRedirect = "http://buildfarm.st.ewi.tudelft.nl/";
344
- }
345
-
338
{ hostName = "strategoxt.org";
339
servedFiles = [
340
{ urlPath = "/freenode.ver";
@@ -372,8 +364,13 @@ rec {
364
365
{ hostName = "svn.strategoxt.org";
366
enableSSL = true;
375
- sslServerCert = "/root/ssl-secrets/server.crt";
376
- sslServerKey = "/root/ssl-secrets/server.key";
367
+ sslServerCert = "/root/ssl-secrets/ssl-strategoxt-org.crt";
368
+ sslServerKey = "/root/ssl-secrets/ssl-strategoxt-org.key";
369
+ extraConfig =
370
+ ''
371
+ SSLCertificateChainFile /root/ssl-secrets/startssl-class1.pem
372
+ SSLCACertificateFile /root/ssl-secrets/startssl-ca.pem
373
+ '';
374
extraSubservices = [
375
{ function = import /etc/nixos/services/subversion;
376
id = "strategoxt";
@@ -434,36 +431,20 @@ rec {
431
];
432
}
433
437
- # Obsolete, kept for backwards compatibility. Replace this
438
- # with a global redirect once Subversion 1.7 has been out for
439
- # a while
440
- # (http://subversion.tigris.org/issues/show_bug.cgi?id=2779).
434
+ # Obsolete, kept for backwards compatibility.
435
{ hostName = "svn.nixos.org";
436
enableSSL = true;
437
sslServerCert = "/root/ssl-secrets/server.crt";
438
sslServerKey = "/root/ssl-secrets/server.key";
445
- extraSubservices = [
446
- { function = import /etc/nixos/services/subversion;
447
- id = "nix";
448
- urlPrefix = "";
449
- dataDir = "/data/subversion-nix";
450
- notificationSender = "svn@svn.nixos.org";
451
- userCreationDomain = "st.ewi.tudelft.nl";
452
- organisation = {
453
- name = "Nix";
454
- url = http://nixos.org/;
455
- logo = http://nixos.org/logo/nixos-lores.png;
456
- };
457
- }
458
- ];
439
extraConfig = ''
460
- RedirectMatch ^/$ https://nixos.org/repoman
440
+ RedirectMatch permanent ^/$ https://nixos.org/repoman
441
+ Redirect permanent / https://nixos.org/
442
'';
443
}
444
445
# Obsolete, kept for backwards compatibility.
446
{ hostName = "svn.nixos.org";
466
- globalRedirect = "https://nixos.org/svn";
447
+ globalRedirect = "https://nixos.org/repoman";
448
}
449
450
{ hostName = "hydra.nixos.org";