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.

Changed files
+5 -3
nixos
modules
-1
nixos/modules/services/misc/defaultUnicornConfig.rb
···
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
+5 -2
nixos/modules/services/misc/gitlab.nix
···
gemHome = "${pkgs.gitlab.env}/${ruby.gemPath}";
+
gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket";
+
pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url;
+
databaseYml = ''
production:
adapter: postgresql
···
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"
···
+ "-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";
};
};