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

Merge pull request #93425 from helsinki-systems/feat/gitlab-shell-config

Browse Source
This commit is contained in:
Jörg Thalheim 2020-08-21 19:20:42 +01:00 committed by GitHub
commit b6e2e4c777
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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;
@ -517,6 +517,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 = {};