colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

couchdb3: add vm.args and fix pkgs.couchdb reference

Browse Source
This commit is contained in:
Will 2021-12-08 16:57:00 +00:00
parent 4d0ea4c290
commit a6196bc8b2
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/services/databases/couchdb.nix
View File

@ -43,8 +43,8 @@ in {
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = pkgs.couchdb; default = pkgs.couchdb3;
defaultText = literalExpression "pkgs.couchdb"; defaultText = literalExpression "pkgs.couchdb3";
description = '' description = ''
CouchDB package to use. CouchDB package to use.
''; '';
@ -150,6 +150,14 @@ in {
''; '';
}; };
argsFile = mkOption {
type = types.path;
default = "${cfg.package}/etc/vm.args";
description = ''
vm.args configuration. Overrides Couchdb's Erlang VM parameters file.
'';
};
configFile = mkOption { configFile = mkOption {
type = types.path; type = types.path;
description = '' description = ''
@ -186,12 +194,14 @@ in {
''; '';
environment = { environment = {
# we are actually specifying 4 configuration files: # we are actually specifying 5 configuration files:
# 1. the preinstalled default.ini # 1. the preinstalled default.ini
# 2. the module configuration # 2. the module configuration
# 3. the extraConfig from the module options # 3. the extraConfig from the module options
# 4. the locally writable config file, which couchdb itself writes to # 4. the locally writable config file, which couchdb itself writes to
ERL_FLAGS= ''-couch_ini ${cfg.package}/etc/default.ini ${configFile} ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} ${cfg.configFile}''; ERL_FLAGS= ''-couch_ini ${cfg.package}/etc/default.ini ${configFile} ${pkgs.writeText "couchdb-extra.ini" cfg.extraConfig} ${cfg.configFile}'';
# 5. the vm.args file
COUCHDB_ARGS_FILE=''${cfg.argsFile}'';
}; };
serviceConfig = { serviceConfig = {

3
nixos/tests/couchdb.nix
View File

@ -56,5 +56,8 @@ with lib;
couchdb3.succeed( couchdb3.succeed(
"${curlJqCheck testlogin "GET" "_all_dbs" ". | length" "0"}" "${curlJqCheck testlogin "GET" "_all_dbs" ". | length" "0"}"
) )
couchdb3.succeed(
"${curlJqCheck testlogin "GET" "_node/couchdb@127.0.0.1" ".couchdb" "Welcome"}"
)
''; '';
}) })