diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-02-26 07:06:07 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-02-26 08:31:20 +0100 |
| commit | 44a4592a1ca763780ad189cfa8ecd20bc1209e3d (patch) | |
| tree | 37833687bfa4b3f560e5fecd701f6202241d7118 /nixos | |
| parent | 3fd51a9ab20660ef4153436ece24b23dc65bccc0 (diff) | |
| download | nixpkgs-44a4592a1ca763780ad189cfa8ecd20bc1209e3d.tar nixpkgs-44a4592a1ca763780ad189cfa8ecd20bc1209e3d.tar.gz nixpkgs-44a4592a1ca763780ad189cfa8ecd20bc1209e3d.tar.bz2 nixpkgs-44a4592a1ca763780ad189cfa8ecd20bc1209e3d.tar.lz nixpkgs-44a4592a1ca763780ad189cfa8ecd20bc1209e3d.tar.xz nixpkgs-44a4592a1ca763780ad189cfa8ecd20bc1209e3d.tar.zst nixpkgs-44a4592a1ca763780ad189cfa8ecd20bc1209e3d.zip | |
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.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/defaultUnicornConfig.rb | 1 | ||||
| -rw-r--r-- | nixos/modules/services/misc/gitlab.nix | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nixos/modules/services/misc/defaultUnicornConfig.rb b/nixos/modules/services/misc/defaultUnicornConfig.rb index 81abaf336dc..84622622db7 100644 --- a/nixos/modules/services/misc/defaultUnicornConfig.rb +++ b/nixos/modules/services/misc/defaultUnicornConfig.rb @@ -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 diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index eef23a0ae42..132b4348854 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -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"; }; }; |