Merge branch 'gitaly-toml' into 'master'

Render config.toml for Gitaly

Closes gitaly#163

See merge request !279

Makefile

@@ -80,11 +80,14 @@ gitlab-shell/.gitlab_shell_secret:
 # Set up gitaly
-gitaly-setup: gitaly/bin/gitaly
+gitaly-setup: gitaly/bin/gitaly gitaly/config.toml
 ${gitaly_clone_dir}/.git:
 	git clone ${gitaly_repo} ${gitaly_clone_dir}
+gitaly/config.toml:
+	sed -e "s|/home/git|${gitlab_development_root}|" $@.example > $@
+
 # Update gitlab, gitlab-shell, gitlab-workhorse and gitaly
 update: unlock-dependency-installers gitlab-update gitlab-shell-update gitlab-workhorse-update gitaly-update

Procfile.example

@@ -13,5 +13,5 @@ rails-background-jobs: exec /usr/bin/env SIDEKIQ_LOG_ARGUMENTS=1 RAILS_ENV=devel
 #grafana: exec support/wait-postgresql-ready support/exec-cd grafana bin/grafana-server -config grafana.ini
 #sshd: exec /usr/sbin/sshd -e -D -f /home/git/openssh/sshd_config
 #nginx: exec nginx -p /home/git/nginx -c conf/nginx.conf
-gitaly: exec /usr/bin/env GITALY_SOCKET_PATH=/home/git/gitaly.socket GITALY_PROMETHEUS_LISTEN_ADDR=:9101 gitaly/bin/gitaly
+gitaly: exec /usr/bin/env GITALY_SOCKET_PATH=/home/git/gitaly.socket GITALY_PROMETHEUS_LISTEN_ADDR=:9236 gitaly/bin/gitaly /home/git/gitaly/config.toml
 webpack: exec /usr/bin/env NODE_ENV=development DEV_SERVER_PORT=3808 support/exec-cd gitlab npm run dev-server

gitaly/config.toml.example

+# Generated by GDK
+
+socket_path = "/home/git/gitaly.socket"
+prometheus_listen_addr = ":9236"
+
+[[storage]]
+name = "default"
+path = "/home/git/repositories"