nixos/gitlab: Support extra config for shell

2020-07-18 16:46:33 +02:00
parent d7e20ee25e
commit f459122ea3
1 changed files with 7 additions and 1 deletions
--- 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 = {};