diff options
| author | tz <tz@FreeBSD.org> | 2016-12-23 20:24:44 +0800 |
|---|---|---|
| committer | tz <tz@FreeBSD.org> | 2016-12-23 20:24:44 +0800 |
| commit | 9c600a4a2536d796ec672a497236ad9a02f05de8 (patch) | |
| tree | 8c1e6cd7c54be5073edc738445b9c01d8a96c5f0 | |
| parent | d60ee07dde3696197d1039fe269c35fd67d3c76e (diff) | |
| download | freebsd-ports-gnome-9c600a4a2536d796ec672a497236ad9a02f05de8.tar.gz freebsd-ports-gnome-9c600a4a2536d796ec672a497236ad9a02f05de8.tar.zst freebsd-ports-gnome-9c600a4a2536d796ec672a497236ad9a02f05de8.zip | |
www/gitlab: Make -authBackend variable
The rc.d script currently has a fixed -authBackend defined which makes
using GitLab under an relative URL impossible.
PR: 210998
Submitted by: Julien Cigar <julien@perdition.city>
Approved by: mentors (implicit)
| -rw-r--r-- | www/gitlab/Makefile | 2 | ||||
| -rw-r--r-- | www/gitlab/files/gitlab.in | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 1ff7446c6281..ef780b07a004 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -4,7 +4,7 @@ PORTNAME= gitlab PORTVERSION= 8.11.11 DISTVERSIONPREFIX= v -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www devel MAINTAINER= tz@FreeBSD.org diff --git a/www/gitlab/files/gitlab.in b/www/gitlab/files/gitlab.in index 01da466575a5..8258bd9bdcd3 100644 --- a/www/gitlab/files/gitlab.in +++ b/www/gitlab/files/gitlab.in @@ -38,6 +38,7 @@ stop_cmd="stop_gitlab" restart_cmd="restart_gitlab" gitlab_enable=${gitlab_enable:-"NO"} +gitlab_authBackend=${gitlab_authBackend:-"http://127.0.0.1:8080"} load_rc_config $name @@ -57,7 +58,7 @@ mail_room_enabled=false mail_room_pid_path="$pid_path/mail_room.pid" gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse && pwd) gitlab_workhorse_pid_path="$pid_path/gitlab-workhorse.pid" -gitlab_workhorse_options="-listenUmask 0 -listenNetwork unix -listenAddr $socket_path/gitlab-workhorse.socket -authBackend http://127.0.0.1:8080 -authSocket $rails_socket -documentRoot $app_root/public" +gitlab_workhorse_options="-listenUmask 0 -listenNetwork unix -listenAddr $socket_path/gitlab-workhorse.socket -authBackend $gitlab_authBackend -authSocket $rails_socket -documentRoot $app_root/public" gitlab_workhorse_log="$app_root/log/gitlab-workhorse.log" shell_path="/bin/bash" |