From abebdb0636fd15bc6e4465a14e79fc7c658819d3 Mon Sep 17 00:00:00 2001 From: Torsten Zuehlsdorff Date: Tue, 28 Nov 2017 16:06:22 +0000 Subject: [PATCH] devel/gitaly: Update config example Add more sections for referenced software using there correct paths. Submitted by: Matthias Fechner --- devel/gitaly/Makefile | 1 + devel/gitaly/files/patch-config.toml.example | 29 ++++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index dce8d7b785b0..00bcd956536c 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -3,6 +3,7 @@ PORTNAME= gitaly DISTVERSIONPREFIX= v DISTVERSION= 0.21.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://gitlab.com/gitlab-org/${PORTNAME}/repository/archive.tar.gz?ref=${DISTVERSIONPREFIX}${PORTVERSION}&dummy=/ diff --git a/devel/gitaly/files/patch-config.toml.example b/devel/gitaly/files/patch-config.toml.example index 2298bf521249..bbf74aafb993 100644 --- a/devel/gitaly/files/patch-config.toml.example +++ b/devel/gitaly/files/patch-config.toml.example @@ -1,5 +1,5 @@ ---- config.toml.example.orig 2017-09-01 10:24:38 UTC -+++ config.toml.example +--- config.toml.example.orig 2017-10-28 10:50:48.245547000 +0200 ++++ config.toml.example 2017-10-28 10:56:00.467310000 +0200 @@ -1,6 +1,6 @@ # Example Gitaly configuration file @@ -8,3 +8,28 @@ # # Optional: listen on a TCP socket. This is insecure (no authentication) # listen_addr = "localhost:9999" +@@ -10,14 +10,20 @@ + # prometheus_listen_addr = "localhost:9236" + # + +-# # Git executable settings +-# [git] +-# bin_path = "/usr/bin/git" ++# Git executable settings ++[git] ++bin_path = "/usr/local/bin/git" + + [[storage]] + name = "default" +-path = "/home/git/repositories" ++path = "/usr/home/git/repositories" + ++[gitaly-ruby] ++dir = "/usr/local/bin/ruby" ++ ++[gitlab-shell] ++dir = "/usr/local/share/gitlab-shell/bin/gitlab-shell" ++ + # # You can optionally configure more storages for this Gitaly instance to serve up + # + # [[storage]]