* Put "buildfarm-supervisor" in $PATH.
svn path=/configurations/trunk/tud/; revision=11668
Eelco Dolstra committed
Apr 21, 2008 at 15:13 UTC
3c5be27ac94e9e721b530ee694459982b8dc3b00
1 file changed
+17
-6
cartman.nix
+17
-6
@@ -142,13 +142,14 @@ rec {
142
extraJobs = [
143
144
{ name = "buildfarm";
145
+ extraPath = [supervisor];
146
job = ''
147
description "Build farm job runner"
148
149
start on network-interfaces/started
150
stop on network-interfaces/stop
151
151
- respawn ${pkgs.su}/bin/su - buildfarm -c 'sendNotifications=1 ${supervisor}/bin/run' > /var/log/buildfarm 2>&1
152
+ respawn ${pkgs.su}/bin/su - buildfarm -c 'sendNotifications=1 ${supervisor}/bin/buildfarm-supervisor' > /var/log/buildfarm 2>&1
153
'';
154
}
155
@@ -237,6 +238,12 @@ rec {
238
{ urlPath = "/releases.css";
239
file = /etc/nixos/release/generic-dist/release-page/releases.css;
240
}
241
+ { urlPath = "/css/releases.css"; # legacy; old releases point here
242
+ file = /etc/nixos/release/generic-dist/release-page/releases.css;
243
+ }
244
+ { urlPath = "/releases/css/releases.css"; # legacy; old releases point here
245
+ file = /etc/nixos/release/generic-dist/release-page/releases.css;
246
+ }
247
];
248
249
virtualHosts = [
@@ -259,11 +266,6 @@ rec {
266
};
267
}
268
];
262
- servedFiles = [
263
- { urlPath = "/releases/css/releases.css"; # legacy; old releases point here
264
- file = /etc/nixos/release/generic-dist/release-page/releases.css;
265
- }
266
- ];
269
servedDirs = [
270
{ urlPath = "/releases";
271
dir = "/data/webserver/dist";
@@ -337,9 +339,18 @@ rec {
339
{ urlPath = "/releases";
340
dir = "/data/webserver/dist/nix";
341
}
342
+ { urlPath = "/tarballs";
343
+ dir = "/data/webserver/tarballs";
344
+ }
345
];
346
}
347
348
+ { hostName = "www.nixos.org";
349
+ extraConfig = ''
350
+ RedirectPermanent / http://nixos.org/
351
+ '';
352
+ }
353
+
354
{ hostName = "svn.nixos.org";
355
extraSubservices = [
356
{ function = import /etc/nixos/nixos/upstart-jobs/apache-httpd/subversion.nix;