diff options
| author | makefu <github@syntax-fehler.de> | 2017-08-05 00:13:41 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-08-05 00:13:41 +0200 |
| commit | 7db5d59018f4096b0cc39afa59df53b6a1fa9353 (patch) | |
| tree | ef4937c2f98639b62aa71af1ef0620e7f28d8dd4 /krebs/3modules/buildbot | |
| parent | 2653cbd257a9e4255bad6d01e6aed4639821b59c (diff) | |
buildbot: remove nixpkgs-fix
buildbot master cannot be run as forking anymore
we start it as --nodaemon as normal type
Diffstat (limited to 'krebs/3modules/buildbot')
| -rw-r--r-- | krebs/3modules/buildbot/master.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/krebs/3modules/buildbot/master.nix b/krebs/3modules/buildbot/master.nix index a7624c8f2..a02f3645d 100644 --- a/krebs/3modules/buildbot/master.nix +++ b/krebs/3modules/buildbot/master.nix @@ -341,8 +341,6 @@ let secretsdir = shell.escape (toString <secrets>); in { PermissionsStartOnly = true; - Type = "forking"; - PIDFile = "${workdir}/twistd.pid"; # TODO: maybe also prepare buildbot.tac? ExecStartPre = pkgs.writeDash "buildbot-master-init" '' set -efux @@ -366,9 +364,7 @@ let chmod 700 -R ${workdir} chown buildbotMaster:buildbotMaster -R ${workdir} ''; - ExecStart = "${pkgs.buildbot-classic}/bin/buildbot start ${workdir}"; - ExecStop = "${pkgs.buildbot-classic}/bin/buildbot stop ${workdir}"; - ExecReload = "${pkgs.buildbot-classic}/bin/buildbot reconfig ${workdir}"; + ExecStart = "${pkgs.buildbot-classic}/bin/buildbot start --nodaemon ${workdir}"; PrivateTmp = "true"; User = "buildbotMaster"; Restart = "always"; |