forked from mirrors/nixpkgs
fixup! gitlab: 8.0.5 -> 8.5.0, service improvements
gitlab-shell is now talking over the unix socket to gitlab, so the TCP port isn't needed anymore.
This commit is contained in:
parent
3fd51a9ab2
commit
44a4592a1c
|
@ -187,7 +187,6 @@ working_directory ENV["GITLAB_PATH"]
|
|||
pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid"
|
||||
|
||||
listen ENV["UNICORN_PATH"] + "/tmp/sockets/gitlab.socket", :backlog => 1024
|
||||
listen "127.0.0.1:8080", :tcp_nopush => true
|
||||
|
||||
timeout 60
|
||||
|
||||
|
|
|
@ -12,6 +12,9 @@ let
|
|||
|
||||
gemHome = "${pkgs.gitlab.env}/${ruby.gemPath}";
|
||||
|
||||
gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket";
|
||||
pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url;
|
||||
|
||||
databaseYml = ''
|
||||
production:
|
||||
adapter: postgresql
|
||||
|
@ -24,7 +27,7 @@ let
|
|||
|
||||
gitlabShellYml = ''
|
||||
user: ${cfg.user}
|
||||
gitlab_url: "http://localhost:8080/"
|
||||
gitlab_url: "http+unix://${pathUrlQuote gitlabSocket}"
|
||||
http_settings:
|
||||
self_signed_cert: false
|
||||
repos_path: "${cfg.statePath}/repositories"
|
||||
|
@ -335,7 +338,7 @@ in {
|
|||
+ "-listenUmask 0 "
|
||||
+ "-listenNetwork unix "
|
||||
+ "-listenAddr /run/gitlab/gitlab-workhorse.socket "
|
||||
+ "-authSocket ${cfg.statePath}/tmp/sockets/gitlab.socket "
|
||||
+ "-authSocket ${gitlabSocket} "
|
||||
+ "-documentRoot ${pkgs.gitlab}/share/gitlab/public";
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue