From 9547d6ffac2a97713dc73f8493ddfab4f79ee610 Mon Sep 17 00:00:00 2001
From: Eike Kettner <eike.kettner@posteo.de>
Date: Tue, 8 Sep 2020 18:07:04 +0200
Subject: [PATCH] Allo setting jvm arguments in nixos modules

---
 nix/configuration-test.nix |  3 +++
 nix/module-joex.nix        |  9 ++++++++-
 nix/module-server.nix      | 10 +++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/nix/configuration-test.nix b/nix/configuration-test.nix
index 2dcd4e12..7c70d9cf 100644
--- a/nix/configuration-test.nix
+++ b/nix/configuration-test.nix
@@ -35,6 +35,7 @@ in
     waitForTarget = "solr-init.target";
     bind.address = "0.0.0.0";
     base-url = "http://localhost:7878";
+    jvmArgs = [ "-J-Xmx2g" ];
     inherit full-text-search;
   };
   services.docspell-restserver = {
@@ -65,6 +66,8 @@ in
       pkgs.docspell.joex
       pkgs.jq
       pkgs.telnet
+      pkgs.htop
+      pkgs.openjdk
     ];
 
 
diff --git a/nix/module-joex.nix b/nix/module-joex.nix
index 7619711f..35e063e0 100644
--- a/nix/module-joex.nix
+++ b/nix/module-joex.nix
@@ -214,6 +214,12 @@ in {
           is running on the same machine.
         '';
       };
+      jvmArgs = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "-J-Xmx1G" ];
+        description = "The options passed to the executable for setting jvm arguments.";
+      };
 
 
       app-id = mkOption {
@@ -1199,7 +1205,8 @@ in {
 
     systemd.services.docspell-joex =
       let
-        cmd = "${pkgs.docspell.joex}/bin/docspell-joex ${configFile}";
+        args = builtins.concatStringsSep " " cfg.jvmArgs;
+        cmd = "${pkgs.docspell.joex}/bin/docspell-joex ${args} -- ${configFile}";
         waitTarget =
           if cfg.waitForTarget != null
           then
diff --git a/nix/module-server.nix b/nix/module-server.nix
index cf0bb195..6b070cc7 100644
--- a/nix/module-server.nix
+++ b/nix/module-server.nix
@@ -89,6 +89,13 @@ in {
           user is created.
         '';
       };
+      jvmArgs = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "-J-Xmx1G" ];
+        description = "The options passed to the executable for setting jvm arguments.";
+      };
+
 
       app-name = mkOption {
         type = types.str;
@@ -513,7 +520,8 @@ in {
 
     systemd.services.docspell-restserver =
     let
-      cmd = "${pkgs.docspell.server}/bin/docspell-restserver ${configFile}";
+      args = builtins.concatStringsSep " " cfg.jvmArgs;
+      cmd = "${pkgs.docspell.server}/bin/docspell-restserver ${args} -- ${configFile}";
     in
     {
       description = "Docspell Rest Server";