Skip to content
Snippets Groups Projects
Commit 87e40d5a authored by Jacob Vosmaer (GitLab)'s avatar Jacob Vosmaer (GitLab)
Browse files

Handle all Gitaly config via config.toml

parent a09bd0cd
No related branches found
No related tags found
1 merge request!281Handle all Gitaly config via config.toml
Pipeline #
Loading
Loading
@@ -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
 
Loading
Loading
Loading
Loading
@@ -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
# Generated by GDK
socket_path = "/home/git/gitaly.socket"
prometheus_listen_addr = ":9236"
[[storage]]
name = "default"
path = "/home/git/repositories"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment