From owner-svn-ports-all@freebsd.org Fri Dec 23 12:24:46 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6E2B9C8EC7C; Fri, 23 Dec 2016 12:24:46 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 23B17810; Fri, 23 Dec 2016 12:24:46 +0000 (UTC) (envelope-from tz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBNCOjAP024014; Fri, 23 Dec 2016 12:24:45 GMT (envelope-from tz@FreeBSD.org) Received: (from tz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBNCOjuo024012; Fri, 23 Dec 2016 12:24:45 GMT (envelope-from tz@FreeBSD.org) Message-Id: <201612231224.uBNCOjuo024012@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org using -f From: Torsten Zuehlsdorff Date: Fri, 23 Dec 2016 12:24:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429253 - in head/www/gitlab: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Dec 2016 12:24:46 -0000 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 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@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"