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.

+5 -3
-1
nixos/modules/services/misc/defaultUnicornConfig.rb
··· 187 pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid" 188 189 listen ENV["UNICORN_PATH"] + "/tmp/sockets/gitlab.socket", :backlog => 1024 190 - listen "127.0.0.1:8080", :tcp_nopush => true 191 192 timeout 60 193
··· 187 pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid" 188 189 listen ENV["UNICORN_PATH"] + "/tmp/sockets/gitlab.socket", :backlog => 1024 190 191 timeout 60 192
+5 -2
nixos/modules/services/misc/gitlab.nix
··· 12 13 gemHome = "${pkgs.gitlab.env}/${ruby.gemPath}"; 14 15 databaseYml = '' 16 production: 17 adapter: postgresql ··· 24 25 gitlabShellYml = '' 26 user: ${cfg.user} 27 - gitlab_url: "http://localhost:8080/" 28 http_settings: 29 self_signed_cert: false 30 repos_path: "${cfg.statePath}/repositories" ··· 335 + "-listenUmask 0 " 336 + "-listenNetwork unix " 337 + "-listenAddr /run/gitlab/gitlab-workhorse.socket " 338 - + "-authSocket ${cfg.statePath}/tmp/sockets/gitlab.socket " 339 + "-documentRoot ${pkgs.gitlab}/share/gitlab/public"; 340 }; 341 };
··· 12 13 gemHome = "${pkgs.gitlab.env}/${ruby.gemPath}"; 14 15 + gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket"; 16 + pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url; 17 + 18 databaseYml = '' 19 production: 20 adapter: postgresql ··· 27 28 gitlabShellYml = '' 29 user: ${cfg.user} 30 + gitlab_url: "http+unix://${pathUrlQuote gitlabSocket}" 31 http_settings: 32 self_signed_cert: false 33 repos_path: "${cfg.statePath}/repositories" ··· 338 + "-listenUmask 0 " 339 + "-listenNetwork unix " 340 + "-listenAddr /run/gitlab/gitlab-workhorse.socket " 341 + + "-authSocket ${gitlabSocket} " 342 + "-documentRoot ${pkgs.gitlab}/share/gitlab/public"; 343 }; 344 };