From 631fce3c6f46a3fbc8ed69e01cb45a3197f220cd Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 30 Oct 2012 14:18:51 +0100
Subject: [PATCH] Logstash: pass TZ, redirect log output to prevent recursion
 when using syslogd.

---
 modules/services/logging/logstash.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/modules/services/logging/logstash.nix b/modules/services/logging/logstash.nix
index 641520ad98d..2f6c6dba943 100644
--- a/modules/services/logging/logstash.nix
+++ b/modules/services/logging/logstash.nix
@@ -136,13 +136,15 @@ in
       mkNameValuePairs = mergeConfigs;
     };
   } ( mkIf cfg.enable {
-    jobs.logstash = with pkgs; {
+    boot.systemd.services.logstash = with pkgs; {
       description = "Logstash daemon";
-      startOn = "started networking and filesystem";
+
+      wantedBy = [ "multi-user.target" ];
+      environment.TZ = config.time.timeZone;
 
       path = [ jre ];
 
-      script = "cd /tmp && exec java -jar ${logstash} agent -f ${writeText "logstash.conf" ''
+      script = "cd /tmp && exec java -jar ${logstash} agent -f ${writeText "logstash.conf" &> /var/log/logstash.log ''
         input {
           ${exprToConfig cfg.inputConfig}
         }