* Enable site backups. * Disable TLS on the web server to work around "SSL negotiation failed: SSL error: parse tlsext" errors in Subversion clients. See http://code.commongroove.com/archive/2009/09/25/apachesubversion-ssl-negotiation-failed-ssl-error-parse-tlsext.aspx * Remove the old buildfarm supervisor.
* Enable site backups. * Disable TLS on the web server to work around "SSL negotiation failed: SSL error: parse tlsext" errors in Subversion clients. See http://code.commongroove.com/archive/2009/09/25/apachesubversion-ssl-negotiation-failed-ssl-error-parse-tlsext.aspx * Remove the old buildfarm supervisor. svn path=/configurations/trunk/tud/; revision=17770
Eelco Dolstra committed
Oct 12, 2009 at 18:11 UTC
ae393f581410b5252aac857547c5f08eae7d77b4
2 files changed
+60
-39
cartman.nix
+57
-34
@@ -13,12 +13,6 @@ let
13
};
14
in map addKey (pkgs.lib.filter (machine: machine ? buildUser) machines);
15
16
- supervisor = import ../../release/supervisor/supervisor.nix {
17
- stateDir = "/home/buildfarm/buildfarm-state";
18
- jobsFile = toString /home/buildfarm/jobs.nix;
19
- fromAddress = "TU Delft Nix Buildfarm <e.dolstra@tudelft.nl>";
20
- };
21
-
16
jiraJetty = (import ../../services/jira/jira-instance.nix).jetty;
17
18
myIP = "130.161.158.181";
@@ -28,7 +22,6 @@ let
22
in
23
24
rec {
31
- #nixpkgs.config.packageOverrides = pkgs: { postgresql = pkgs.postgresql84 ; } ;
25
26
boot = {
27
grubDevice = "/dev/sda";
@@ -57,15 +50,6 @@ rec {
50
inherit buildMachines;
51
extraOptions = ''
52
gc-keep-outputs = true
60
-
61
- # The default (`true') slows Nix down a lot since the build farm
62
- # has so many GC roots.
63
- gc-check-reachability = false
64
-
65
- # Hydra needs caching of build failures.
66
- build-cache-failure = true
67
-
68
- build-poll-interval = 10
53
'';
54
};
55
@@ -132,10 +116,7 @@ rec {
116
"45 ${toString hour} * * * buildfarm (cd /etc/nixos/release/index && PATH=${pkgs.saxonb}/bin:$PATH ./make-index.sh ${dir} ${url} /releases.css) | ${pkgs.utillinux}/bin/logger -t index";
117
in
118
[
135
- "15 0 * * * root (TZ=CET date; ${pkgs.rsync}/bin/rsync -razv --numeric-ids --delete /data/subversion* /data/vm /data/pt-wiki /data/postgresql /data/webserver/tarballs /home/buildfarm/hydra unixhome.st.ewi.tudelft.nl::bfarm/) >> /var/log/backup.log 2>&1"
136
-
137
- # Releases indices.
138
- (indexJob 01 "/data/webserver/dist/nix" http://nixos.org/releases/)
119
+ "15 0 * * * root (TZ=CET date; ${pkgs.rsync}/bin/rsync -razv --numeric-ids --delete /data/postgresql /data/webserver/tarballs unixhome.st.ewi.tudelft.nl::bfarm/) >> /var/log/backup.log 2>&1"
120
(indexJob 02 "/data/webserver/dist/strategoxt2" http://releases.strategoxt.org/)
121
(indexJob 05 "/data/webserver/dist" http://buildfarm.st.ewi.tudelft.nl/)
122
@@ -164,20 +145,6 @@ rec {
145
146
extraJobs = [
147
167
- /*
168
- { name = "buildfarm";
169
- extraPath = [supervisor];
170
- job = ''
171
- description "Build farm job runner"
172
-
173
- #start on network-interfaces/started
174
- stop on network-interfaces/stop
175
-
176
- respawn ${pkgs.su}/bin/su - buildfarm -c 'sendNotifications=0 ${supervisor}/bin/buildfarm-supervisor' > /var/log/buildfarm 2>&1
177
- '';
178
- }
179
- */
180
-
148
{ name = "jira";
149
users = [
150
{ name = "jira";
@@ -235,6 +202,8 @@ rec {
202
Order deny,allow
203
Allow from all
204
</Location>
205
+
206
+ SSLProtocol all -TLSv1
207
'';
208
209
servedFiles = [
@@ -440,6 +409,60 @@ rec {
409
];
410
};
411
412
+ postgresqlBackup = {
413
+ enable = true;
414
+ databases = [ "hydra" "jira" ];
415
+ };
416
+
417
+ sitecopy = {
418
+ enable = true;
419
+ backups =
420
+ let genericBackup = { server = "webdata.tudelft.nl";
421
+ protocol = "webdav";
422
+ https = true ;
423
+ symlinks = "ignore";
424
+ };
425
+ in [
426
+ ( genericBackup // { name = "postgresql";
427
+ local = config.services.postgresqlBackup.location;
428
+ remote = "/staff-groups/ewi/st/strategoxt/backup/postgresql";
429
+ } )
430
+ ( genericBackup // { name = "subversion";
431
+ local = "/data/subversion";
432
+ remote = "/staff-groups/ewi/st/strategoxt/backup/subversion/subversion";
433
+ } )
434
+ ( genericBackup // { name = "subversion-nix";
435
+ local = "/data/subversion-nix";
436
+ remote = "/staff-groups/ewi/st/strategoxt/backup/subversion/subversion-nix";
437
+ period = "15 03 * * *";
438
+ } )
439
+ ( genericBackup // { name = "subversion-ptg";
440
+ local = "/data/subversion-ptg";
441
+ remote = "/staff-groups/ewi/st/strategoxt/backup/subversion/subversion-ptg";
442
+ } )
443
+ ( genericBackup // { name = "subversion-strategoxt";
444
+ local = "/data/subversion-strategoxt";
445
+ remote = "/staff-groups/ewi/st/strategoxt/backup/subversion/subversion-strategoxt";
446
+ period = "15 02 * * *";
447
+ } )
448
+ ( genericBackup // { name = "webserver-dist-nix";
449
+ local = "/data/webserver/dist/nix";
450
+ remote = "/staff-groups/ewi/st/strategoxt/backup/webserver-dist-nix";
451
+ period = "5 03 * * *";
452
+ } )
453
+# ( genericBackup // { name = "webserver-tarballs";
454
+# local = "/data/webserver/tarballs";
455
+# remote = "/staff-groups/ewi/st/strategoxt/backup/webserver-tarballs";
456
+# period = "5 03 * * *";
457
+# } )
458
+ ( genericBackup // { name = "pt-wiki";
459
+ local = "/data/pt-wiki";
460
+ remote = "/staff-groups/ewi/st/strategoxt/backup/pt-wiki";
461
+ period = "55 02 * * *";
462
+ } )
463
+ ];
464
+ };
465
+
466
/*
467
zabbixAgent = {
468
enable = true;
webroot/index.html
+3
-5
@@ -51,7 +51,7 @@
51
<table class="service">
52
<tr>
53
<td>
54
- <a href="releases">
54
+ <a href="http://hydra.nixos.org/">
55
<img alt="Delft Farm" src="delft-farm.jpg" width="162px" class="service" align="top"/>
56
</a>
57
</td>
@@ -61,9 +61,7 @@
61
<p>
62
The Nix Buildfarm of the TU Delft Software Engineering
63
Research Group continuously builds a wide range of
64
- software developed by the group and externally. The
65
- release indexes list the unstable and stable distributions
66
- constructed by the Nix Buildfarm.
64
+ software developed by the group and externally.
65
</p>
66
</td>
67
</tr>
@@ -90,7 +88,7 @@
88
</table>
89
90
<p class="footer">
93
- Administrator: <a href="mailto:martin.bravenboer@gmail.com">Martin Bravenboer</a>
91
+ Administrator: <a href="mailto:e.dolstra@tudelft.nl">Eelco Dolstra</a>
92
</p>
93
</body>
94
</html>