svn path=/configurations/trunk/tud/; revision=12018
svn path=/configurations/trunk/tud/; revision=12018
Eelco Dolstra committed
Jun 9, 2008 at 11:15 UTC
bf8cc3318fd54890d6d22a2af3e6611e570de315
2 files changed
+49
-48
buildfarm/jobs.nix
+10
-1
@@ -11,7 +11,7 @@ let
11
inputs = {
12
job = pathInput ../../../release;
13
#job = svnInput jobBaseline;
14
- nixpkgs = svnInputRev nixpkgsBaseline 11620;
14
+ nixpkgs = svnInputRev nixpkgsBaseline 11922;
15
} // attrs.inputs;
16
};
17
@@ -106,6 +106,15 @@ in
106
jobAttr = "nixpkgsRelease";
107
};
108
109
+ nixpkgsStdenvBranch = makeNixJob {
110
+ dirName = "nixpkgs-stdenv-branch";
111
+ inputs = {
112
+ nixpkgsCheckout = svnInput https://svn.nixos.org/repos/nix/nixpkgs/branches/stdenv-updates;
113
+ };
114
+ jobExpr = "../jobs/nix/nixpkgs.nix";
115
+ jobAttr = "nixpkgsRelease";
116
+ };
117
+
118
119
/* NixOS */
120
cartman.nix
+39
-47
@@ -52,7 +52,7 @@ rec {
52
];
53
54
nix = {
55
- maxJobs = 2;
55
+ maxJobs = 1;
56
distributedBuilds = true;
57
inherit buildMachines;
58
};
@@ -112,14 +112,18 @@ rec {
112
};
113
114
cron = {
115
- systemCronJobs = [
116
- "25 * * * * root (TZ=CET date; ${pkgs.rsync}/bin/rsync -razv --numeric-ids --delete /data/subversion* /data/vm /data/pt-wiki /data/postgresql unixhome.st.ewi.tudelft.nl::bfarm/) >> /var/log/backup.log 2>&1"
117
-
118
- # Releases indices.
119
- "10 * * * * buildfarm (cd /etc/nixos/release/index && PATH=${pkgs.saxonb}/bin:$PATH ./make-index.sh /data/webserver/dist/nix http://nixos.org/releases/ /releases.css) >> /var/log/index 2>&1"
120
- "20 * * * * buildfarm (cd /etc/nixos/release/index && PATH=${pkgs.saxonb}/bin:$PATH ./make-index.sh /data/webserver/dist/strategoxt2 http://releases.strategoxt.org/ /releases.css) >> /var/log/index 2>&1"
121
- "30 * * * * buildfarm (cd /etc/nixos/release/index && PATH=${pkgs.saxonb}/bin:$PATH ./make-index.sh /data/webserver/dist http://buildfarm.st.ewi.tudelft.nl /releases.css) >> /var/log/index 2>&1"
122
- ];
115
+ systemCronJobs =
116
+ let indexJob = minute: dir: url:
117
+ "${toString minute} * * * * buildfarm (cd /etc/nixos/release/index && PATH=${pkgs.saxonb}/bin:$PATH ./make-index.sh ${dir} ${url} /releases.css) | ${pkgs.utillinux}/bin/logger -t index";
118
+ in
119
+ [
120
+ "25 * * * * root (TZ=CET date; ${pkgs.rsync}/bin/rsync -razv --numeric-ids --delete /data/subversion* /data/vm /data/pt-wiki /data/postgresql unixhome.st.ewi.tudelft.nl::bfarm/) >> /var/log/backup.log 2>&1"
121
+
122
+ # Releases indices.
123
+ (indexJob 10 "/data/webserver/dist/nix" http://nixos.org/releases/)
124
+ (indexJob 20 "/data/webserver/dist/strategoxt2" http://releases.strategoxt.org/)
125
+ (indexJob 40 "/data/webserver/dist" http://buildfarm.st.ewi.tudelft.nl/)
126
+ ];
127
};
128
129
dhcpd = {
@@ -187,44 +191,6 @@ rec {
191
dataDir = "/data/postgresql";
192
};
193
190
- nagios = {
191
- enable = true;
192
- enableWebInterface = true;
193
- objectDefs = [
194
- ./nagios-base.cfg
195
- (pkgs.writeText "nagios-machines.cfg" (
196
- map (machine:
197
- let hostName = machine.hostName; in
198
- "
199
- define host {
200
- host_name ${hostName}
201
- use generic-server
202
- alias Build machine ${hostName} (${machine.system})
203
- address ${hostName}
204
- hostgroups tud-buildfarm
205
- }
206
-
207
- define service {
208
- service_description SSH on ${hostName}
209
- use local-service
210
- host_name ${hostName}
211
- servicegroups ssh
212
- check_command check_ssh
213
- }
214
-
215
- #define service {
216
- # service_description /nix on ${hostName}
217
- # use local-service
218
- # host_name ${hostName}
219
- # servicegroups diskspace
220
- # check_command check_remote_disk!nagios!/var/lib/nagios/id_nagios!75%!10%!/nix
221
- #}
222
- "
223
- ) machineList
224
- ))
225
- ];
226
- };
227
-
194
httpd = {
195
enable = true;
196
experimental = true;
@@ -237,6 +203,19 @@ rec {
203
204
extraConfig = ''
205
AddType application/nix-package .nixpkg
206
+
207
+ ScriptAlias /status /home/eelco/release/status/status.pl
208
+ <Location /status>
209
+ Order deny,allow
210
+ Allow from all
211
+ </Location>
212
+
213
+ Alias /zabbix ${pkgs.zabbixServer}/share/zabbix/php
214
+ <Directory ${pkgs.zabbixServer}/share/zabbix/php>
215
+ DirectoryIndex index.php
216
+ Order deny,allow
217
+ Allow from *
218
+ </Directory>
219
'';
220
221
servedFiles = [
@@ -416,6 +395,19 @@ rec {
395
396
];
397
};
398
+
399
+ zabbixAgent = {
400
+ enable = true;
401
+ };
402
+
403
+ zabbixServer = {
404
+ enable = true;
405
+ };
406
+
407
+ };
408
+
409
+ environment = {
410
+ nix = pkgs: pkgs.nixNoBDB;
411
};
412
413
}