svn path=/configurations/trunk/tud/; revision=24887
svn path=/configurations/trunk/tud/; revision=24887
Eelco Dolstra committed
Nov 26, 2010 at 22:50 UTC
cae39699ff31532c6a4f4f521d3e2c5a642b0180
1 file changed
+41
-18
cartman.nix
+41
-18
@@ -37,12 +37,17 @@ rec {
37
kernelModules = ["kvm-intel"];
38
};
39
40
- fileSystems = [
41
- { mountPoint = "/";
42
- label = "nixos";
43
- options = "acl";
44
- }
45
- ];
40
+ fileSystems =
41
+ [ { mountPoint = "/";
42
+ label = "nixos";
43
+ options = "acl";
44
+ }
45
+ { mountPoint = "/data/releases";
46
+ device = "192.168.1.25:/data/releases";
47
+ fsType = "nfs";
48
+ options = "vers=3"; # !!! check why vers=4 doesn't work
49
+ }
50
+ ];
51
52
swapDevices = [
53
{ label = "swap1"; }
@@ -296,20 +301,11 @@ rec {
301
{ urlPath = "/update";
302
dir = "/data/webserver/update";
303
}
304
+ { urlPath = "/releases";
305
+ dir = "/data/releases";
306
+ }
307
];
308
301
- extraConfig = ''
302
- <Proxy *>
303
- Order deny,allow
304
- Allow from all
305
- </Proxy>
306
-
307
- ProxyRequests Off
308
- ProxyPreserveHost On
309
- ProxyPass /releases/ http://lucifer:80/releases/
310
- ProxyPassReverse /releases/ http://lucifer:80/releases/
311
- '';
312
-
309
servedFiles = [
310
{ urlPath = "/releases/css/releases.css";
311
file = releasesCSS;
@@ -357,6 +353,20 @@ rec {
353
'';
354
}
355
356
+ { hostName = "hydra-test.nixos.org";
357
+ extraConfig = ''
358
+ <Proxy *>
359
+ Order deny,allow
360
+ Allow from all
361
+ </Proxy>
362
+
363
+ ProxyRequests Off
364
+ ProxyPreserveHost On
365
+ ProxyPass / http://hydra:3001/ retry=5
366
+ ProxyPassReverse / http://hydra:3001/
367
+ '';
368
+ }
369
+
370
{ hostName = "wiki.nixos.org";
371
extraConfig = ''
372
RedirectMatch ^/$ /wiki
@@ -378,6 +388,19 @@ rec {
388
documentRoot = "/home/karltk/public_html/planet";
389
}
390
391
+ { hostName = "sonar.nixos.org";
392
+ extraConfig = ''
393
+ <Proxy *>
394
+ Order deny,allow
395
+ Allow from all
396
+ </Proxy>
397
+
398
+ ProxyRequests Off
399
+ ProxyPreserveHost On
400
+ ProxyPass / http://lucifer:8080/ retry=5
401
+ ProxyPassReverse / http://lucifer:8080/
402
+ '';
403
+ }
404
];
405
};
406