alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

fixup! gitlab: 8.0.5 -> 8.5.0, service improvements

Browse source 
gitlab-shell is now talking over the unix socket to gitlab, so the TCP
port isn't needed anymore.
This commit is contained in:
Franz Pletz 2016-02-26 07:06:07 +01:00
parent 3fd51a9ab2
commit 44a4592a1c
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/services/misc/defaultUnicornConfig.rb
View file

@ -187,7 +187,6 @@ working_directory ENV["GITLAB_PATH"]
pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid" pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid"
listen ENV["UNICORN_PATH"] + "/tmp/sockets/gitlab.socket", :backlog => 1024 listen ENV["UNICORN_PATH"] + "/tmp/sockets/gitlab.socket", :backlog => 1024
listen "127.0.0.1:8080", :tcp_nopush => true
timeout 60 timeout 60

7
nixos/modules/services/misc/gitlab.nix
View file

@ -12,6 +12,9 @@ let
gemHome = "${pkgs.gitlab.env}/${ruby.gemPath}"; gemHome = "${pkgs.gitlab.env}/${ruby.gemPath}";
gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket";
pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url;
databaseYml = '' databaseYml = ''
production: production:
adapter: postgresql adapter: postgresql
@ -24,7 +27,7 @@ let
gitlabShellYml = '' gitlabShellYml = ''
user: ${cfg.user} user: ${cfg.user}
gitlab_url: "http://localhost:8080/" gitlab_url: "http+unix://${pathUrlQuote gitlabSocket}"
http_settings: http_settings:
self_signed_cert: false self_signed_cert: false
repos_path: "${cfg.statePath}/repositories" repos_path: "${cfg.statePath}/repositories"
@ -335,7 +338,7 @@ in {
+ "-listenUmask 0 " + "-listenUmask 0 "
+ "-listenNetwork unix " + "-listenNetwork unix "
+ "-listenAddr /run/gitlab/gitlab-workhorse.socket " + "-listenAddr /run/gitlab/gitlab-workhorse.socket "
+ "-authSocket ${cfg.statePath}/tmp/sockets/gitlab.socket " + "-authSocket ${gitlabSocket} "
+ "-documentRoot ${pkgs.gitlab}/share/gitlab/public"; + "-documentRoot ${pkgs.gitlab}/share/gitlab/public";
}; };
}; };