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

Merge pull request #56072 from bgamari/gitlab-database-config

Browse Source 
nixos/gitlab: Introduce database pool size option
This commit is contained in:
Florian Klink 2019-02-20 01:56:28 +01:00 committed by GitHub
commit 11699d03bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nixos/modules/services/misc/gitlab.nix
View File

@ -22,7 +22,8 @@ let
password = cfg.databasePassword; password = cfg.databasePassword;
username = cfg.databaseUsername; username = cfg.databaseUsername;
encoding = "utf8"; encoding = "utf8";
}; pool = cfg.databasePool;
} // cfg.extraDatabaseConfig;
}; };
gitalyToml = pkgs.writeText "gitaly.toml" '' gitalyToml = pkgs.writeText "gitaly.toml" ''
@ -253,6 +254,18 @@ in {
description = "Gitlab database user."; description = "Gitlab database user.";
}; };
databasePool = mkOption {
type = types.int;
default = 5;
description = "Database connection pool size.";
};
extraDatabaseConfig = mkOption {
type = types.attrs;
default = {};
description = "Extra configuration in config/database.yml.";
};
host = mkOption { host = mkOption {
type = types.str; type = types.str;
default = config.networking.hostName; default = config.networking.hostName;