svn path=/configurations/trunk/tud/; revision=20785
svn path=/configurations/trunk/tud/; revision=20785
Eelco Dolstra committed
Mar 23, 2010 at 14:57 UTC
9d34ade5ad9ebeb05118802ac3bcf31cc156ba73
2 files changed
+34
-10
cartman.nix
+28
-10
@@ -355,7 +355,7 @@ rec {
355
organisation = {
356
name = "Nix";
357
url = http://nixos.org/;
358
- logo = http://subversion.tigris.org/images/subversion_logo_hor-468x64.png; # !!! need a logo
358
+ logo = http://nixos.org/logo/nixos-lores.png;
359
};
360
}
361
];
@@ -400,9 +400,32 @@ rec {
400
documentRoot = "/home/karltk/public_html/planet";
401
}
402
403
- { hostName = "buildfarm.info";
404
- serverAliases = ["www.buildfarm.info"];
405
- documentRoot = "/data/webserver/buildfarm.info";
403
+ { hostName = "test.researchr.org";
404
+ extraConfig = ''
405
+ <Proxy *>
406
+ Order deny,allow
407
+ Allow from all
408
+ </Proxy>
409
+
410
+ ProxyRequests Off
411
+ ProxyPreserveHost On
412
+ ProxyPass / http://mrhankey:8080/ retry=5
413
+ ProxyPassReverse / http://mrhankey:8080/
414
+ '';
415
+ }
416
+
417
+ { hostName = "test.nixos.org";
418
+ extraConfig = ''
419
+ <Proxy *>
420
+ Order deny,allow
421
+ Allow from all
422
+ </Proxy>
423
+
424
+ ProxyRequests Off
425
+ ProxyPreserveHost On
426
+ ProxyPass / http://mrhankey:8080/ retry=5
427
+ ProxyPassReverse / http://mrhankey:8080/
428
+ '';
429
}
430
431
];
@@ -410,7 +433,7 @@ rec {
433
434
postgresqlBackup = {
435
enable = true;
413
- databases = [ "hydra" "jira" ];
436
+ databases = [ "jira" ];
437
};
438
439
sitecopy = {
@@ -463,11 +486,6 @@ rec {
486
};
487
488
zabbixAgent.enable = true;
466
- zabbixAgent.extraConfig =
467
- ''
468
- UserParameter=hydra.queue.total,${pkgs.postgresql}/bin/psql hydra -At -c 'select count(*) from builds where finished = 0'
469
- UserParameter=hydra.queue.building,${pkgs.postgresql}/bin/psql hydra -At -c 'select count(*) from builds natural join BuildSchedulingInfo where finished = 0 and busy = 1'
470
- '';
489
490
zabbixServer.enable = true;
491
machines.nix
+6
@@ -128,4 +128,10 @@
128
ipAddress = "192.168.1.22";
129
ethernetAddress = "00:26:b9:35:bb:ca";
130
}
131
+
132
+ {
133
+ hostName = "mrhankey";
134
+ ipAddress = "192.168.1.24";
135
+ ethernetAddress = "00:1D:09:0E:09:E5";
136
+ }
137
]