diff options
| author | Pascal Wittmann <PascalWittmann@gmx.net> | 2014-07-21 20:02:11 +0200 |
|---|---|---|
| committer | Pascal Wittmann <PascalWittmann@gmx.net> | 2014-07-21 20:02:11 +0200 |
| commit | 261ecebfaf4970966d37b737f1a72fdee044df32 (patch) | |
| tree | 5c8ad5038340734f44454625f12c4ae0da1b0117 | |
| parent | 5156b5d11d3b258024ef67e958eae97bc16f77ec (diff) | |
| parent | 8f31b1393809ec5c97d1e5bd4859bba644593b7d (diff) | |
| download | nixpkgs-261ecebfaf4970966d37b737f1a72fdee044df32.tar nixpkgs-261ecebfaf4970966d37b737f1a72fdee044df32.tar.gz nixpkgs-261ecebfaf4970966d37b737f1a72fdee044df32.tar.bz2 nixpkgs-261ecebfaf4970966d37b737f1a72fdee044df32.tar.lz nixpkgs-261ecebfaf4970966d37b737f1a72fdee044df32.tar.xz nixpkgs-261ecebfaf4970966d37b737f1a72fdee044df32.tar.zst nixpkgs-261ecebfaf4970966d37b737f1a72fdee044df32.zip | |
Merge pull request #3323 from wjlroe/logstash-1.4.2
Logstash 1.4.2
| -rw-r--r-- | nixos/modules/services/logging/logstash.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/logstash/default.nix | 39 |
2 files changed, 35 insertions, 8 deletions
diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index c92c8113570..802dd454878 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} } diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix index a613dad3ec9..15c99fff54c 100644 --- a/pkgs/tools/misc/logstash/default.nix +++ b/pkgs/tools/misc/logstash/default.nix @@ -1,11 +1,38 @@ -{ fetchurl }: +{ stdenv, fetchurl }: -let version = "1.3.3"; in +stdenv.mkDerivation rec { + version = "1.4.2"; + name = "logstash-${version}"; -fetchurl { - url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}-flatjar.jar"; + src = fetchurl { + url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz"; + sha256 = "0sc0bwyf96fzs5h3d7ii65v9vvpfbm7w67vk1im9djnlz0d1ggnm"; + }; - name = "logstash-${version}-flatjar.jar"; + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + dontPatchShebangs = true; - sha256 = "a83503bd2aa32e1554b98f812d0b411fbc5f7b6b21cebb48b7d344474f2dfc6d"; + installPhase = '' + ensureDir $out/bin + ensureDir $out/vendor + ensureDir $out/lib + ensureDir $out/locales + ensureDir $out/patterns + cp -a bin $out + cp -a vendor $out + cp -a lib $out + cp -a locales $out + cp -a patterns $out + patchShebangs $out/bin + ''; + + meta = { + description = "Open Source, Distributed, RESTful Search Engine"; + homepage = http://www.elasticsearch.org; + license = stdenv.lib.licenses.asl20; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.wjlroe ]; + }; } |