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

nixos/gitlab: Support extra config for shell

Browse Source
This commit is contained in:
Janne Heß 2020-07-18 16:46:33 +02:00
parent d7e20ee25e
commit f459122ea3
No known key found for this signature in database
GPG Key ID: 69165158F05265DF
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,7 @@ let
'') gitlabConfig.production.repositories.storages))} '') gitlabConfig.production.repositories.storages))}
''; '';
gitlabShellConfig = { gitlabShellConfig = flip recursiveUpdate cfg.extraShellConfig {
user = cfg.user; user = cfg.user;
gitlab_url = "http+unix://${pathUrlQuote gitlabSocket}"; gitlab_url = "http+unix://${pathUrlQuote gitlabSocket}";
http_settings.self_signed_cert = false; http_settings.self_signed_cert = false;
@ -511,6 +511,12 @@ in {
''; '';
}; };
extraShellConfig = mkOption {
type = types.attrs;
default = {};
description = "Extra configuration to merge into shell-config.yml";
};
extraConfig = mkOption { extraConfig = mkOption {
type = types.attrs; type = types.attrs;
default = {}; default = {};