Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

graylog: improve JRE handling

Since the upstream graylogctl script will prefer finding its java
executable based on JAVA_HOME, we now set this instead of PATH in
order to allow it to find the JRE. By setting it conditionally on it
not already being set, we allow selecting a different JRE at runtime.

We also explicitly use openjdk11, which supports the
UseConcMarkSweepGC option which graylog insists on using.

+4 -6
+2 -4
nixos/modules/services/logging/graylog.nix
··· 39 type = types.package; 40 default = pkgs.graylog; 41 defaultText = "pkgs.graylog"; 42 - example = literalExample "pkgs.graylog"; 43 description = "Graylog package to use."; 44 }; 45 ··· 138 "d '${cfg.messageJournalDir}' - ${cfg.user} - - -" 139 ]; 140 141 - systemd.services.graylog = with pkgs; { 142 description = "Graylog Server"; 143 wantedBy = [ "multi-user.target" ]; 144 environment = { 145 - JAVA_HOME = jre; 146 GRAYLOG_CONF = "${confFile}"; 147 }; 148 - path = [ pkgs.jre_headless pkgs.which pkgs.procps ]; 149 preStart = '' 150 rm -rf /var/lib/graylog/plugins || true 151 mkdir -p /var/lib/graylog/plugins -m 755
··· 39 type = types.package; 40 default = pkgs.graylog; 41 defaultText = "pkgs.graylog"; 42 description = "Graylog package to use."; 43 }; 44 ··· 137 "d '${cfg.messageJournalDir}' - ${cfg.user} - - -" 138 ]; 139 140 + systemd.services.graylog = { 141 description = "Graylog Server"; 142 wantedBy = [ "multi-user.target" ]; 143 environment = { 144 GRAYLOG_CONF = "${confFile}"; 145 }; 146 + path = [ pkgs.which pkgs.procps ]; 147 preStart = '' 148 rm -rf /var/lib/graylog/plugins || true 149 mkdir -p /var/lib/graylog/plugins -m 755
+2 -2
pkgs/tools/misc/graylog/default.nix
··· 1 - { lib, stdenv, fetchurl, makeWrapper, jre_headless, nixosTests }: 2 3 stdenv.mkDerivation rec { 4 pname = "graylog"; ··· 13 dontStrip = true; 14 15 nativeBuildInputs = [ makeWrapper ]; 16 - makeWrapperArgs = [ "--prefix" "PATH" ":" "${jre_headless}/bin" ]; 17 18 passthru.tests = { inherit (nixosTests) graylog; }; 19
··· 1 + { lib, stdenv, fetchurl, makeWrapper, openjdk11_headless, nixosTests }: 2 3 stdenv.mkDerivation rec { 4 pname = "graylog"; ··· 13 dontStrip = true; 14 15 nativeBuildInputs = [ makeWrapper ]; 16 + makeWrapperArgs = [ "--set-default" "JAVA_HOME" "${openjdk11_headless}" ]; 17 18 passthru.tests = { inherit (nixosTests) graylog; }; 19