* Run old-style and new-style supervisor.
svn path=/configurations/trunk/tud/; revision=10859
Eelco Dolstra committed
Feb 26, 2008 at 13:54 UTC
7f160878bcb7489ec4ffbb3006547db9c3008915
1 file changed
+20
-2
main.nix
+20
-2
@@ -18,11 +18,19 @@ let
18
19
supervisor = import ../../release/supervisor/supervisor.nix {
20
stateDir = "/home/buildfarm/buildfarm-state";
21
- jobsURL = https://svn.cs.uu.nl:12443/repos/trace/configurations/trunk/tud/supervisor/jobs.conf;
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>";
25
};
26
27
+ supervisorOld = import ../../old-release/supervisor/supervisor.nix {
28
+ stateDir = "/home/buildfarm/buildfarm-state-old";
29
+ jobsURL = https://svn.cs.uu.nl:12443/repos/trace/configurations/trunk/tud/supervisor/jobs.conf;
30
+ smtpHost = "smtp.st.ewi.tudelft.nl";
31
+ fromAddress = "TU Delft Nix Legacy Buildfarm <martin@st.ewi.tudelft.nl>";
32
+ };
33
+
34
jiraJetty = (import ../../services/jira/jira-instance.nix).jetty;
35
36
myIP = "130.161.158.181";
@@ -151,11 +159,21 @@ rec {
159
start on network-interfaces/started
160
stop on network-interfaces/stop
161
154
- #respawn ${pkgs.su}/bin/su - root -c 'NIX_REMOTE= ${supervisor}/bin/run' > /var/log/buildfarm 2>&1
162
respawn ${pkgs.su}/bin/su - buildfarm -c ${supervisor}/bin/run > /var/log/buildfarm 2>&1
163
'';
164
}
165
166
+ { name = "buildfarm-supervisor-old";
167
+ job = ''
168
+ description "Build farm job starter (legacy jobs)"
169
+
170
+ start on network-interfaces/started
171
+ stop on network-interfaces/stop
172
+
173
+ respawn ${pkgs.su}/bin/su - buildfarm -c ${supervisorOld}/bin/run > /var/log/buildfarm-old 2>&1
174
+ '';
175
+ }
176
+
177
{ name = "jira";
178
users = [
179
{ name = "jira";