diff options
| author | Robin Gloster <mail@glob.in> | 2018-01-07 04:59:56 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-01-07 05:02:56 +0100 |
| commit | e606bb252b05bc739844c3c15a1f5b00be729deb (patch) | |
| tree | 6629a7d4dd1cfb135da62fa1ae81a78905a903c0 /nixos/modules/services/misc/gitlab.nix | |
| parent | 1c5fd46d6c2ed8242bc35b850b8b1c02306ca18b (diff) | |
| download | nixlib-e606bb252b05bc739844c3c15a1f5b00be729deb.tar nixlib-e606bb252b05bc739844c3c15a1f5b00be729deb.tar.gz nixlib-e606bb252b05bc739844c3c15a1f5b00be729deb.tar.bz2 nixlib-e606bb252b05bc739844c3c15a1f5b00be729deb.tar.lz nixlib-e606bb252b05bc739844c3c15a1f5b00be729deb.tar.xz nixlib-e606bb252b05bc739844c3c15a1f5b00be729deb.tar.zst nixlib-e606bb252b05bc739844c3c15a1f5b00be729deb.zip | |
gitlab module: config changes for gitlab 10.3
Diffstat (limited to 'nixos/modules/services/misc/gitlab.nix')
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 07edad0b2ef6..9ed5875a0191 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -108,6 +108,7 @@ let ldap.enabled = false; omniauth.enabled = false; shared.path = "${cfg.statePath}/shared"; + gitaly.client_path = "${cfg.packages.gitaly}/bin"; backup.path = "${cfg.backupPath}"; gitlab_shell = { path = "${cfg.packages.gitlab-shell}"; @@ -121,8 +122,6 @@ let }; git = { bin_path = "git"; - max_size = 20971520; # 20MB - timeout = 10; }; monitoring = { ip_whitelist = [ "127.0.0.0/8" "::1/128" ]; @@ -493,6 +492,8 @@ in { after = [ "network.target" "gitlab.service" ]; wantedBy = [ "multi-user.target" ]; environment.HOME = gitlabEnv.HOME; + environment.GEM_HOME = "${cfg.packages.gitaly.rubyEnv}/${ruby.gemPath}"; + environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH; path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv ruby ]; serviceConfig = { #PermissionsStartOnly = true; # preStart must be run as root |