aboutsummaryrefslogtreecommitdiffstats
path: root/www
diff options
context:
space:
mode:
authortz <tz@FreeBSD.org>2016-12-23 20:13:33 +0800
committertz <tz@FreeBSD.org>2016-12-23 20:13:33 +0800
commitd60ee07dde3696197d1039fe269c35fd67d3c76e (patch)
treeee9f11f04344588bb5016bda151b01a5d30c1b1d /www
parent2ffac830158afdc52c4e9f4b3f461d784130cc4d (diff)
downloadfreebsd-ports-gnome-d60ee07dde3696197d1039fe269c35fd67d3c76e.tar.gz
freebsd-ports-gnome-d60ee07dde3696197d1039fe269c35fd67d3c76e.tar.zst
freebsd-ports-gnome-d60ee07dde3696197d1039fe269c35fd67d3c76e.zip
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)
Diffstat (limited to 'www')
-rw-r--r--www/gitlab/Makefile4
-rw-r--r--www/gitlab/pkg-plist4
2 files changed, 5 insertions, 3 deletions
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 1909a0e1cf8a..1ff7446c6281 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -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
diff --git a/www/gitlab/pkg-plist b/www/gitlab/pkg-plist
index 83b82beeee93..9f5aeb0af8c9 100644
--- a/www/gitlab/pkg-plist
+++ b/www/gitlab/pkg-plist
@@ -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