svn commit: r429253 - in head/www/gitlab: . files

Torsten Zuehlsdorff tz at FreeBSD.org
Fri Dec 23 12:24:46 UTC 2016


Author: tz
Date: Fri Dec 23 12:24:44 2016
New Revision: 429253
URL: https://svnweb.freebsd.org/changeset/ports/429253

Log:
  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 at perdition.city>
  Approved by:  mentors (implicit)

Modified:
  head/www/gitlab/Makefile
  head/www/gitlab/files/gitlab.in

Modified: head/www/gitlab/Makefile
==============================================================================
--- head/www/gitlab/Makefile	Fri Dec 23 12:13:33 2016	(r429252)
+++ head/www/gitlab/Makefile	Fri Dec 23 12:24:44 2016	(r429253)
@@ -4,7 +4,7 @@
 PORTNAME=	gitlab
 PORTVERSION=	8.11.11
 DISTVERSIONPREFIX=	v
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www devel
 
 MAINTAINER=	tz at FreeBSD.org

Modified: head/www/gitlab/files/gitlab.in
==============================================================================
--- head/www/gitlab/files/gitlab.in	Fri Dec 23 12:13:33 2016	(r429252)
+++ head/www/gitlab/files/gitlab.in	Fri Dec 23 12:24:44 2016	(r429253)
@@ -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"
 


More information about the svn-ports-all mailing list