Made it possible to use another PREFIX for gitlab-ce.

Reviewed by:	swills (mentor)
Approved by:	swills (mentor)
Differential Revision:	https://reviews.freebsd.org/D16266
This commit is contained in:
Matthias Fechner 2018-07-18 21:53:13 +00:00
parent a7c59946a6
commit 9a56eb2413
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=474905
2 changed files with 7 additions and 5 deletions

View file

@ -2,6 +2,7 @@
PORTNAME= gitaly
DISTVERSION= 0.105.0
PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= mfechner@FreeBSD.org
@ -44,6 +45,7 @@ GL_ACCOUNT= gitlab-org
GL_COMMIT= 90ec422b0e76840075010476898637a92f287245
post-patch:
${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example
${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample
do-install:

View file

@ -4,11 +4,11 @@
# Example Gitaly configuration file
-socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket"
+socket_path = "/usr/local/www/gitlab-ce/tmp/sockets/private/gitaly.socket"
+socket_path = "%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket"
# The directory where Gitaly's executables are stored
-bin_dir = "/home/git/gitaly"
+bin_dir = "/usr/local/share/gitaly/bin/"
+bin_dir = "%%PREFIX%%/share/gitaly/bin/"
# # Optional: listen on a TCP socket. This is insecure (no authentication)
# listen_addr = "localhost:9999"
@ -19,7 +19,7 @@
-# [git]
-# bin_path = "/usr/bin/git"
+[git]
+bin_path = "/usr/local/bin/git"
+bin_path = "%%PREFIX%%/bin/git"
[[storage]]
name = "default"
@ -33,7 +33,7 @@
[gitaly-ruby]
# The directory where gitaly-ruby is installed
-dir = "/home/git/gitaly/ruby"
+dir = "/usr/local/share/gitaly/ruby"
+dir = "%%PREFIX%%/share/gitaly/ruby"
# # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes)
# max_rss = 300000000
@ -42,7 +42,7 @@
[gitlab-shell]
# The directory where gitlab-shell is installed
-dir = "/home/git/gitlab-shell"
+dir = "/usr/local/share/gitlab-shell"
+dir = "%%PREFIX%%/share/gitlab-shell"
# # You can adjust the concurrency of each RPC endpoint
# [[concurrency]]