TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-05 19:09:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1880 from VTimofeenko/nix-flake-extraConfig

Browse Source 
nix: add extraConfig option
This commit is contained in:
eikek 2022-12-13 08:07:44 +01:00 committed by GitHub
commit cc665e4aaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nix/checks/configuration-test.nix
View File

@ -58,6 +58,16 @@ in
} }
]; ];
inherit full-text-search; inherit full-text-search;
extraConfig = {
files = {
default-store = "database";
stores = {
minio = {
enabled = true;
};
};
};
};
}; };
environment.systemPackages = environment.systemPackages =

21
nix/modules/joex.nix
View File

@ -3,10 +3,12 @@ overlay: { config, lib, pkgs, ... }:
with lib; with lib;
let let
cfg = config.services.docspell-joex; cfg = config.services.docspell-joex;
# Extract the config without the extraConfig attribute. It will be merged later
declared_config = attrsets.filterAttrs (n: v: n != "extraConfig") cfg;
user = if cfg.runAs == null then "docspell" else cfg.runAs; user = if cfg.runAs == null then "docspell" else cfg.runAs;
configFile = pkgs.writeText "docspell-joex.conf" '' configFile = pkgs.writeText "docspell-joex.conf" ''
{"docspell": { "joex": {"docspell": { "joex":
${builtins.toJSON cfg} ${builtins.toJSON (lib.recursiveUpdate declared_config cfg.extraConfig)}
}} }}
''; '';
defaults = { defaults = {
@ -1670,6 +1672,23 @@ in
default = defaults.addons; default = defaults.addons;
description = "Addon executor config"; description = "Addon executor config";
}; };
extraConfig = mkOption {
type = types.attrs;
description = "Extra configuration for docspell server. Overwrites values in case of a conflict.";
default = { };
example = ''
{
files = {
default-store = "minio";
stores = {
minio = {
enabled = true;
};
};
};
}
'';
};
}; };
}; };

21
nix/modules/server.nix
View File

@ -3,10 +3,12 @@ overlay: { config, lib, pkgs, ... }:
with lib; with lib;
let let
cfg = config.services.docspell-restserver; cfg = config.services.docspell-restserver;
# Extract the config without the extraConfig attribute. It will be merged later
declared_config = attrsets.filterAttrs (n: v: n != "extraConfig") cfg;
user = if cfg.runAs == null then "docspell" else cfg.runAs; user = if cfg.runAs == null then "docspell" else cfg.runAs;
configFile = pkgs.writeText "docspell-server.conf" '' configFile = pkgs.writeText "docspell-server.conf" ''
{"docspell": {"server": {"docspell": {"server":
${builtins.toJSON cfg} ${builtins.toJSON (lib.recursiveUpdate declared_config cfg.extraConfig)}
}} }}
''; '';
defaults = { defaults = {
@ -839,6 +841,23 @@ in
default = defaults.backend; default = defaults.backend;
description = "Configuration for the backend"; description = "Configuration for the backend";
}; };
extraConfig = mkOption {
type = types.attrs;
description = "Extra configuration for docspell server. Overwrites values in case of a conflict.";
default = { };
example = ''
{
files = {
default-store = "minio";
stores = {
minio = {
enabled = true;
};
};
};
}
'';
};
}; };
}; };