about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorPascal Wittmann <PascalWittmann@gmx.net>2014-07-21 20:02:11 +0200
committerPascal Wittmann <PascalWittmann@gmx.net>2014-07-21 20:02:11 +0200
commit261ecebfaf4970966d37b737f1a72fdee044df32 (patch)
tree5c8ad5038340734f44454625f12c4ae0da1b0117 /nixos
parent5156b5d11d3b258024ef67e958eae97bc16f77ec (diff)
parent8f31b1393809ec5c97d1e5bd4859bba644593b7d (diff)
downloadnixlib-261ecebfaf4970966d37b737f1a72fdee044df32.tar
nixlib-261ecebfaf4970966d37b737f1a72fdee044df32.tar.gz
nixlib-261ecebfaf4970966d37b737f1a72fdee044df32.tar.bz2
nixlib-261ecebfaf4970966d37b737f1a72fdee044df32.tar.lz
nixlib-261ecebfaf4970966d37b737f1a72fdee044df32.tar.xz
nixlib-261ecebfaf4970966d37b737f1a72fdee044df32.tar.zst
nixlib-261ecebfaf4970966d37b737f1a72fdee044df32.zip
Merge pull request #3323 from wjlroe/logstash-1.4.2
Logstash 1.4.2
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/logging/logstash.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index c92c81135704..802dd454878b 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -69,9 +69,9 @@ in
     systemd.services.logstash = with pkgs; {
       description = "Logstash Daemon";
       wantedBy = [ "multi-user.target" ];
-
+      environment = { JAVA_HOME = jre; };
       serviceConfig = {
-        ExecStart = "${jre}/bin/java -jar ${logstash} agent -f ${writeText "logstash.conf" ''
+        ExecStart = "${logstash}/bin/logstash agent -f ${writeText "logstash.conf" ''
           input {
             ${cfg.inputConfig}
           }