Merge branch 'gitaly-no-env-vars' into 'master'

Handle all Gitaly config via config.toml

See merge request !281

Makefile

@@ -86,7 +86,10 @@ ${gitaly_clone_dir}/.git:
 	git clone ${gitaly_repo} ${gitaly_clone_dir}
 gitaly/config.toml:
-	sed -e "s|/home/git|${gitlab_development_root}|" $@.example > $@
+	sed \
+	  -e "s|^socket_path.*|socket_path = \"${gitlab_development_root}/gitaly.socket\"|" \
+	  -e "s|# prometheus_listen_addr|prometheus_listen_addr|" \
+	  -e "s|/home/git|${gitlab_development_root}|" ${gitaly_clone_dir}/config.toml.example > $@
 # Update gitlab, gitlab-shell, gitlab-workhorse and gitaly

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=:9236 gitaly/bin/gitaly /home/git/gitaly/config.toml
+gitaly: exec 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"