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

gitlab module: config changes for gitlab 10.3

Browse Source
This commit is contained in:
Robin Gloster 2018-01-07 04:59:56 +01:00
parent 1c5fd46d6c
commit e606bb252b
No known key found for this signature in database
GPG Key ID: D5C458DF6DD97EDF
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,6 +108,7 @@ let
ldap.enabled = false; ldap.enabled = false;
omniauth.enabled = false; omniauth.enabled = false;
shared.path = "${cfg.statePath}/shared"; shared.path = "${cfg.statePath}/shared";
gitaly.client_path = "${cfg.packages.gitaly}/bin";
backup.path = "${cfg.backupPath}"; backup.path = "${cfg.backupPath}";
gitlab_shell = { gitlab_shell = {
path = "${cfg.packages.gitlab-shell}"; path = "${cfg.packages.gitlab-shell}";
@ -121,8 +122,6 @@ let
}; };
git = { git = {
bin_path = "git"; bin_path = "git";
max_size = 20971520; # 20MB
timeout = 10;
}; };
monitoring = { monitoring = {
ip_whitelist = [ "127.0.0.0/8" "::1/128" ]; ip_whitelist = [ "127.0.0.0/8" "::1/128" ];
@ -493,6 +492,8 @@ in {
after = [ "network.target" "gitlab.service" ]; after = [ "network.target" "gitlab.service" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
environment.HOME = gitlabEnv.HOME; 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 ]; path = with pkgs; [ gitAndTools.git cfg.packages.gitaly.rubyEnv ruby ];
serviceConfig = { serviceConfig = {
#PermissionsStartOnly = true; # preStart must be run as root #PermissionsStartOnly = true; # preStart must be run as root