From 8081c791e97b05e916a7c8697d3bf795fea5b407 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 27 Sep 2015 19:25:06 +0200
Subject: [PATCH] nixos/taskserver: Remove options for log/pidFile

We're aiming for a proper integration into systemd/journald, so we
really don't want zillions of separate log files flying around in our
system.

Same as with the pidFile. The latter is only needed for taskdctl, which
is a SysV-style initscript and all of its functionality plus a lot more
is handled by systemd already.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/services/misc/taskserver.nix | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/nixos/modules/services/misc/taskserver.nix b/nixos/modules/services/misc/taskserver.nix
index 519b6bb30fd..73d9ef567f4 100644
--- a/nixos/modules/services/misc/taskserver.nix
+++ b/nixos/modules/services/misc/taskserver.nix
@@ -73,23 +73,6 @@ in {
         type = types.bool;
       };
 
-      log = mkOption {
-        default = "/tmp/taskd.log";
-        description = ''
-          Fully-qualified path name to the Taskserver log file.
-        '';
-        type = types.string;
-      };
-
-      pidFile = mkOption {
-        default = "/tmp/taskd.pid";
-        description = ''
-          Fully-qualified path name to the Taskserver PID file. This is used
-          by the 'taskdctl' script to start/stop the daemon.
-        '';
-        type = types.string;
-      };
-
       queueSize = mkOption {
         default = 10;
         description = ''
@@ -221,8 +204,6 @@ in {
               $file "${cfg.dataDir}/$file.pem"
           done
 
-          ${pkgs.taskserver}/bin/taskd config --force log "${cfg.log}"
-          ${pkgs.taskserver}/bin/taskd config --force pid.file "${cfg.pidFile}"
           ${pkgs.taskserver}/bin/taskd config --force server ${cfg.server.host}:${toString cfg.server.port}
 
           touch "${cfg.dataDir}/.is_initialized"