From 7db5d59018f4096b0cc39afa59df53b6a1fa9353 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 5 Aug 2017 00:13:41 +0200
Subject: buildbot: remove nixpkgs-fix

buildbot master cannot be run as forking anymore
we start it as --nodaemon as normal type
---
 krebs/3modules/buildbot/master.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'krebs/3modules')

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";
-- 
cgit v1.2.3