Unverified Commit 0397741f authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #324698 from bbenno/graylog-6_0

parents e1770bd1 ed904c25
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ let
    message_journal_dir = ${cfg.messageJournalDir}
    mongodb_uri = ${cfg.mongodbUri}
    plugin_dir = /var/lib/graylog/plugins
    data_dir = ${cfg.dataDir}

    ${cfg.extraConfig}
  '';
@@ -93,6 +94,12 @@ in
        description = "List of valid URIs of the http ports of your elastic nodes. If one or more of your elasticsearch hosts require authentication, include the credentials in each node URI that requires authentication";
      };

      dataDir = mkOption {
        type = types.str;
        default = "/var/lib/graylog/data";
        description = "Directory used to store Graylog server state.";
      };

      messageJournalDir = mkOption {
        type = types.str;
        default = "/var/lib/graylog/data/journal";
+9 −0
Original line number Diff line number Diff line
{ callPackage, lib, ...}:
let
  buildGraylog = callPackage ./graylog.nix {};
in buildGraylog {
  version = "6.0.4";
  sha256 = "sha256-PU7AepIRwx7FibBkZaQUWUy3v2MeM7cS77FH28aj8I8=";
  maintainers = with lib.maintainers; [ bbenno ];
  license = lib.licenses.sspl;
}
+2 −0
Original line number Diff line number Diff line
@@ -8499,6 +8499,8 @@ with pkgs;
  graylog-5_2 = callPackage ../tools/misc/graylog/5.2.nix { };
  graylog-6_0 = callPackage ../tools/misc/graylog/6.0.nix { };
  graylogPlugins = recurseIntoAttrs (
    callPackage ../tools/misc/graylog/plugins.nix { }
  );