Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 23 Dec 2016 12:13:33 +0000 (UTC)
From:      Torsten Zuehlsdorff <tz@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r429252 - head/www/gitlab
Message-ID:  <201612231213.uBNCDXo0020042@repo.freebsd.org>

Next in thread | Raw E-Mail | Index | Archive | Help
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



Want to link to this message? Use this URL: <http://docs.FreeBSD.org/cgi/mid.cgi?201612231213.uBNCDXo0020042>