* Host nixos.org on cartman.
svn path=/configurations/trunk/tud/; revision=11240
Eelco Dolstra committed
Mar 20, 2008 at 17:30 UTC
a09247aa7979e634034314b4d3be10435c1b940a
2 files changed
+29
-10
cartman.nix
+16
-9
@@ -20,15 +20,14 @@ let
20
stateDir = "/home/buildfarm/buildfarm-state";
21
#jobsURL = https://svn.cs.uu.nl:12443/repos/trace/configurations/trunk/tud/supervisor/jobs.nix;
22
jobsFile = toString /etc/nixos/configurations/tud/supervisor/jobs.nix;
23
- smtpHost = "smtp.st.ewi.tudelft.nl";
24
- fromAddress = "TU Delft Nix Buildfarm <martin@st.ewi.tudelft.nl>";
23
+ fromAddress = "TU Delft Nix Buildfarm <e.dolstra@tudelft.nl>";
24
};
25
26
supervisorOld = import ../../old-release/supervisor/supervisor.nix {
27
stateDir = "/home/buildfarm/buildfarm-state-old";
28
jobsURL = https://svn.cs.uu.nl:12443/repos/trace/configurations/trunk/tud/supervisor/jobs.conf;
29
smtpHost = "smtp.st.ewi.tudelft.nl";
31
- fromAddress = "TU Delft Nix Legacy Buildfarm <martin@st.ewi.tudelft.nl>";
30
+ fromAddress = "TU Delft Nix Legacy Buildfarm <e.dolstra@tudelft.nl>";
31
};
32
33
jiraJetty = (import ../../services/jira/jira-instance.nix).jetty;
@@ -144,20 +143,20 @@ rec {
143
144
extraJobs = [
145
147
- { name = "buildfarm-supervisor";
146
+ { name = "buildfarm";
147
job = ''
149
- description "Build farm job starter"
148
+ description "Build farm job runner"
149
150
start on network-interfaces/started
151
stop on network-interfaces/stop
152
154
- respawn ${pkgs.su}/bin/su - buildfarm -c ${supervisor}/bin/run > /var/log/buildfarm 2>&1
153
+ respawn ${pkgs.su}/bin/su - buildfarm -c 'sendNotifications=1 ${supervisor}/bin/run' > /var/log/buildfarm 2>&1
154
'';
155
}
156
158
- { name = "buildfarm-supervisor-old";
157
+ { name = "buildfarm-old";
158
job = ''
160
- description "Build farm job starter (legacy jobs)"
159
+ description "Build farm job runner (legacy jobs)"
160
161
start on network-interfaces/started
162
stop on network-interfaces/stop
@@ -269,7 +268,6 @@ rec {
268
uploaderIPs = ["127.0.0.1" myIP];
269
distPasswords = "/data/webserver/upload_passwords";
270
directoriesConf = ''
272
- nix ${distDir}/nix nix-upload
271
nix-cache ${distDir}/nix-cache nix-upload strategoxt-upload meta-environment-upload ut-fmt-upload
272
strategoxt ${distDir}/strategoxt strategoxt-upload
273
meta-environment ${distDir}/meta-environment meta-environment-upload
@@ -336,6 +334,15 @@ rec {
334
'';
335
}
336
337
+ { hostName = "nixos.org";
338
+ documentRoot = "/home/eelco/nix-homepage";
339
+ servedDirs = [
340
+ { urlPath = "/releases";
341
+ dir = "/data/webserver/dist/nix";
342
+ }
343
+ ];
344
+ }
345
+
346
{ hostName = "svn.nixos.org";
347
extraSubservices = [
348
{ function = import /etc/nixos/nixos/upstart-jobs/apache-httpd/subversion.nix;
supervisor/jobs.nix
+13
-1
@@ -53,6 +53,18 @@ in
53
54
{
55
56
+ /* Nix */
57
+
58
+ nixTrunk = makeNixJob {
59
+ dirName = "nix";
60
+ inputs = {
61
+ nixCheckout = svnInput https://svn.cs.uu.nl:12443/repos/trace/nix/trunk;
62
+ };
63
+ jobExpr = "../jobs/nix/nix.nix";
64
+ jobAttr = "nixRelease";
65
+ };
66
+
67
+
68
/* PatchELF */
69
70
patchelfTrunk = makeNixJob {
@@ -62,7 +74,6 @@ in
74
};
75
jobExpr = "../jobs/nix/patchelf.nix";
76
jobAttr = "patchelfRelease";
65
- #noRelease = true;
77
};
78
79
@@ -80,6 +91,7 @@ in
91
};
92
*/
93
94
+
95
/* Groove */
96
97
/*