svn path=/configurations/trunk/tud/; revision=33024
svn path=/configurations/trunk/tud/; revision=33024
Eelco Dolstra committed
Mar 12, 2012 at 21:24 UTC
912f6576f54357822fe9d18912ac41acaa4d1b0a
1 file changed
+7
-7
hydra-module.nix
+7
-7
@@ -46,7 +46,7 @@ in
46
};
47
48
dbi = mkOption {
49
- default = "dbi:Pg:dbname=hydra;host=webdsl.org;user=hydra;";
49
+ default = "dbi:Pg:dbname=hydra;host=wendy;user=hydra;";
50
description = ''
51
The DBI string for Hydra database connection
52
'';
@@ -128,7 +128,7 @@ in
128
build-poll-interval = 10
129
'';
130
131
- jobs.hydra_init =
131
+ jobs."hydra-init" =
132
{ name = "hydra-init";
133
startOn = "filesystem";
134
script = ''
@@ -139,7 +139,7 @@ in
139
task = true;
140
};
141
142
- jobs.hydra_server =
142
+ jobs."hydra-server" =
143
{ name = "hydra-server";
144
startOn = "started network-interfaces and started hydra-init";
145
exec = ''
@@ -147,16 +147,16 @@ in
147
'';
148
};
149
150
- jobs.hydra_queue_runner =
150
+ jobs."hydra-queue-runner" =
151
{ name = "hydra-queue-runner";
152
startOn = "started network-interfaces and started hydra-init";
153
- preStart = "${pkgs.su}/bin/su - ${cfg.user} -c 'hydra-queue-runner --unlock'";
153
+ preStart = "${pkgs.su}/bin/su - ${cfg.user} -c '${env} hydra-queue-runner --unlock'";
154
exec = ''
155
- ${pkgs.su}/bin/su - ${cfg.user} -c 'exec hydra-queue-runner > ${cfg.baseDir}/data/queue_runner.log 2>&1'
155
+ ${pkgs.su}/bin/su - ${cfg.user} -c '${env} exec hydra-queue-runner > ${cfg.baseDir}/data/queue_runner.log 2>&1'
156
'';
157
};
158
159
- jobs.hydra_evaluator =
159
+ jobs."hydra-evaluator" =
160
{ name = "hydra-evaluator";
161
startOn = "started network-interfaces";
162
exec = ''