diff options
| author | Janne Heß <janne@hess.ooo> | 2020-07-18 16:46:33 +0200 |
|---|---|---|
| committer | Janne Heß <janne@hess.ooo> | 2020-07-18 16:46:33 +0200 |
| commit | f459122ea3c9fda1ea7bb97974571df5134d6769 (patch) | |
| tree | 7b048202a7c5ca74cf350bfa732b06f7735f9929 /nixos | |
| parent | d7e20ee25ed8aa1f0f24a9ca77026c6ef217f6ba (diff) | |
| download | nixpkgs-f459122ea3c9fda1ea7bb97974571df5134d6769.tar nixpkgs-f459122ea3c9fda1ea7bb97974571df5134d6769.tar.gz nixpkgs-f459122ea3c9fda1ea7bb97974571df5134d6769.tar.bz2 nixpkgs-f459122ea3c9fda1ea7bb97974571df5134d6769.tar.lz nixpkgs-f459122ea3c9fda1ea7bb97974571df5134d6769.tar.xz nixpkgs-f459122ea3c9fda1ea7bb97974571df5134d6769.tar.zst nixpkgs-f459122ea3c9fda1ea7bb97974571df5134d6769.zip | |
nixos/gitlab: Support extra config for shell
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 1ada131bd7b..9b843e81dc5 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -54,7 +54,7 @@ let '') gitlabConfig.production.repositories.storages))} ''; - gitlabShellConfig = { + gitlabShellConfig = flip recursiveUpdate cfg.extraShellConfig { user = cfg.user; gitlab_url = "http+unix://${pathUrlQuote gitlabSocket}"; 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 { type = types.attrs; default = {}; |