mirror of
https://github.com/TheAnachronism/docspell.git
synced 2025-09-28 15:48:22 +00:00
Rename server -> restserver in nix setup
While I'd like to rename it the other way around, it would be a much more breaking change. So for now, this way.
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
tesseract4,
|
||||
python3Packages,
|
||||
unoconv,
|
||||
docspell-server,
|
||||
docspell-restserver,
|
||||
docspell-joex,
|
||||
}: let
|
||||
mkImage = {
|
||||
@@ -64,10 +64,10 @@
|
||||
tag = "v${pkg.version}";
|
||||
};
|
||||
in {
|
||||
docspell-server = mkImage {
|
||||
docspell-restserver = mkImage {
|
||||
name = "docspell-restserver";
|
||||
port = 7880;
|
||||
pkg = docspell-server;
|
||||
pkg = docspell-restserver;
|
||||
tools = [];
|
||||
};
|
||||
docspell-joex = mkImage {
|
||||
|
@@ -12,7 +12,7 @@ with lib; let
|
||||
if cfg.runAs == null
|
||||
then "docspell"
|
||||
else cfg.runAs;
|
||||
configFile = pkgs.writeText "docspell-server.conf" ''
|
||||
configFile = pkgs.writeText "docspell-restserver.conf" ''
|
||||
{"docspell": {"server":
|
||||
${builtins.toJSON (lib.recursiveUpdate declared_config cfg.extraConfig)}
|
||||
}}
|
||||
@@ -878,7 +878,7 @@ in {
|
||||
|
||||
systemd.services.docspell-restserver = let
|
||||
args = builtins.concatStringsSep " " cfg.jvmArgs;
|
||||
cmd = "${pkgs.docspell-server}/bin/docspell-restserver ${args} -- ${configFile}";
|
||||
cmd = "${pkgs.docspell-restserver}/bin/docspell-restserver ${args} -- ${configFile}";
|
||||
in {
|
||||
description = "Docspell Rest Server";
|
||||
after = ["networking.target"];
|
||||
|
@@ -14,9 +14,9 @@
|
||||
sha256 = "sha256-flKWjEsMd2/XT3Bu6EjFgf3lCojvLbKFDEXemP1K+/8=";
|
||||
};
|
||||
in {
|
||||
docspell-server = stdenv.mkDerivation {
|
||||
docspell-restserver = stdenv.mkDerivation {
|
||||
inherit version;
|
||||
pname = "docspell-server";
|
||||
pname = "docspell-restserver";
|
||||
|
||||
src = fetchzip server;
|
||||
buildInputs = [jdk17];
|
||||
@@ -30,6 +30,7 @@ in {
|
||||
$out/docspell-restserver-${version}/bin/docspell-restserver -java-home ${jdk17} "\$@"
|
||||
EOF
|
||||
chmod 755 $out/bin/docspell-restserver
|
||||
|
||||
'';
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user