From owner-svn-ports-all@freebsd.org  Fri Dec 23 12:13:34 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
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 B8998C8E7F1;
 Fri, 23 Dec 2016 12:13:34 +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 6DC921FA2;
 Fri, 23 Dec 2016 12:13:34 +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 uBNCDXwq020044;
 Fri, 23 Dec 2016 12:13:33 GMT (envelope-from tz@FreeBSD.org)
Received: (from tz@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBNCDXo0020042;
 Fri, 23 Dec 2016 12:13:33 GMT (envelope-from tz@FreeBSD.org)
Message-Id: <201612231213.uBNCDXo0020042@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tz set sender to tz@FreeBSD.org
 using -f
From: Torsten Zuehlsdorff <tz@FreeBSD.org>
Date: Fri, 23 Dec 2016 12:13:33 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r429252 - head/www/gitlab
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Dec 2016 12:13:34 -0000

Author: tz
Date: Fri Dec 23 12:13:33 2016
New Revision: 429252
URL: https://svnweb.freebsd.org/changeset/ports/429252

Log:
  www/gitlab: Make shipped nginx config files @sample
  
  The shipped nginx config files require the user to change them. But
  after an update they are reset to the default-content. Now
  mark them as @sample so the will stay intact.
  
  PR:           215510
  Submitted by: Martin Waschbüsch <martin@waschbuesch.de>
  Approved by:  mentors (implicit)

Modified:
  head/www/gitlab/Makefile
  head/www/gitlab/pkg-plist

Modified: head/www/gitlab/Makefile
==============================================================================
--- head/www/gitlab/Makefile	Fri Dec 23 12:10:31 2016	(r429251)
+++ head/www/gitlab/Makefile	Fri Dec 23 12:13:33 2016	(r429252)
@@ -4,7 +4,7 @@
 PORTNAME=	gitlab
 PORTVERSION=	8.11.11
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www devel
 
 MAINTAINER=	tz@FreeBSD.org
@@ -184,6 +184,8 @@ do-install:
 	${MV} ${WRKSRC}/config/resque.yml.example ${WRKSRC}/config/resque.yml.sample
 	${MV} ${WRKSRC}/config/secrets.yml.example ${WRKSRC}/config/secrets.yml.sample
 	${MV} ${WRKSRC}/config/initializers/rack_attack.rb.example ${WRKSRC}/config/initializers/rack_attack.rb.sample
+	${MV} ${WRKSRC}/lib/support/nginx/gitlab ${WRKSRC}/lib/support/nginx/gitlab.sample
+	${MV} ${WRKSRC}/lib/support/nginx/gitlab-ssl ${WRKSRC}/lib/support/nginx/gitlab-ssl.sample
 	${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample
 	${MKDIR} ${STAGEDIR}/home/git/repositories
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/assets

Modified: head/www/gitlab/pkg-plist
==============================================================================
--- head/www/gitlab/pkg-plist	Fri Dec 23 12:10:31 2016	(r429251)
+++ head/www/gitlab/pkg-plist	Fri Dec 23 12:13:33 2016	(r429252)
@@ -3495,8 +3495,6 @@
 %%WWWDIR%%/lib/support/init.d/gitlab
 %%WWWDIR%%/lib/support/init.d/gitlab.default.example
 %%WWWDIR%%/lib/support/logrotate/gitlab
-%%WWWDIR%%/lib/support/nginx/gitlab
-%%WWWDIR%%/lib/support/nginx/gitlab-ssl
 %%WWWDIR%%/lib/support/nginx/registry-ssl
 %%WWWDIR%%/lib/tasks/brakeman.rake
 %%WWWDIR%%/lib/tasks/cache.rake
@@ -4673,3 +4671,5 @@
 @sample %%WWWDIR%%/config/secrets.yml.sample
 @sample %%WWWDIR%%/config/initializers/rack_attack.rb.sample
 @sample %%WWWDIR%%/config/database.yml.sample
+@sample %%WWWDIR%%/lib/support/nginx/gitlab.sample
+@sample %%WWWDIR%%/lib/support/nginx/gitlab-ssl.sample