diff options
| author | lassulus <lassulus@lassul.us> | 2017-08-05 00:30:12 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-08-05 00:30:12 +0200 |
| commit | 1372af65f4ccaff582b7a396b52ba48ee970b71d (patch) | |
| tree | a77a1bf836e86c5d401510b4a50060953e833bbd /krebs/3modules | |
| parent | 8fcc77c4901ec8efa5b15613045446c5625b76ed (diff) | |
| parent | 7db5d59018f4096b0cc39afa59df53b6a1fa9353 (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'krebs/3modules')
| -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"; |