Merge pull request #116936 from hercules-ci/logstash-jdk

2021-03-30 17:22:21 +02:00
parent 36a4bbd3b9 9011d59758
commit 7d0dad76ef
5 changed files with 36 additions and 8 deletions
@@ -159,10 +159,9 @@ in
  ###### implementation

  config = mkIf cfg.enable {
-    systemd.services.logstash = with pkgs; {
+    systemd.services.logstash = {
      description = "Logstash Daemon";
      wantedBy = [ "multi-user.target" ];
-      environment = { JAVA_HOME = jre; };
      path = [ pkgs.bash ];
      serviceConfig = {
        ExecStartPre = ''${pkgs.coreutils}/bin/mkdir -p "${cfg.dataDir}" ; ${pkgs.coreutils}/bin/chmod 700 "${cfg.dataDir}"'';