swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

buildbot NixOS modules: switch to not daemonize

Browse source 
1) The forking behavior of `buildbot start` is temporarily broken for
   mysterious reasons that I'm still looking into
2) Let systemd do the forking: no point in using two different process
   startup wait loops
This commit is contained in:
Dan Peebles 2017-03-10 00:02:49 -05:00
parent bce352949e
commit c390cec122
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/continuous-integration/buildbot/master.nix
View file

@ -217,11 +217,11 @@ in {
path = cfg.packages;
serviceConfig = {
Type = "forking";
Type = "simple";
User = cfg.user;
Group = cfg.group;
WorkingDirectory = cfg.home;
ExecStart = "${cfg.package}/bin/buildbot start ${cfg.buildbotDir}";
ExecStart = "${cfg.package}/bin/buildbot start --nodaemon ${cfg.buildbotDir}";
};
preStart = ''

4
nixos/modules/services/continuous-integration/buildbot/worker.nix
View file

@ -111,11 +111,11 @@ in {
'';
serviceConfig = {
Type = "forking";
Type = "simple";
User = cfg.user;
Group = cfg.group;
WorkingDirectory = cfg.home;
ExecStart = "${cfg.package}/bin/buildbot-worker start ${cfg.buildbotDir}";
ExecStart = "${cfg.package}/bin/buildbot-worker start --nodaemon ${cfg.buildbotDir}";
};
};