git: bc45fb4f772e - 2025Q1 - www/gitlab: fixed permission database.yml and failing backup

The branch 2025Q1 has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bc45fb4f772e893dc533fdf159c522432a2ea276

commit bc45fb4f772e893dc533fdf159c522432a2ea276
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2025-01-17 13:42:58 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2025-01-23 09:48:13 +0000

    www/gitlab: fixed permission database.yml and failing backup
    
    (cherry picked from commit 38e7302dd7c93a362d422c3cc24986d369a7ef00)
---
 www/gitlab/Makefile        | 3 +++
 www/gitlab/Makefile.common | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index bb6a18d86979..e01bc7f29157 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -428,6 +428,7 @@ do-install:
 	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/sessions
 	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/backups
 	${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/sockets/private/internal
+	${MKDIR} ${STAGEDIR}${WWWDIR}/shared/external-diffs
 	${MKDIR} ${STAGEDIR}${WWWDIR}/shared/tmp
 	${MKDIR} ${STAGEDIR}${WWWDIR}/shared/artifacts/tmp/work
 	${MKDIR} ${STAGEDIR}${WWWDIR}/vendor/assets/stylesheets
@@ -442,6 +443,7 @@ post-install:
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' | \
 		${SED} -E -e '/sample$$/ s#^#@sample #; \
 		/secrets.yml.sample$$/ s#^@sample #@sample(git,www,0600) #; \
+		/database.yml.sample$$/ s#^@sample #@sample(git,www,0600) #; \
 		s#${WWWDIR_REL}/bin#@(git,,544) ${WWWDIR_REL}/bin#; \
 		/db\/schema.rb$$|gitlab.po$$|gitlab.pot$$|gitlab.po.time_stamp$$|locale\/index.js$$/ s#^#@(git,,) #;' >> ${TMPPLIST}
 	@${ECHO_CMD} "@owner git" >> ${TMPPLIST}
@@ -502,6 +504,7 @@ post-install:
 	@${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/shared/pages" >> ${TMPPLIST}
 	@${ECHO_CMD} "@group www" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/terraform_state" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/external-diffs" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/tmp" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/lfs-objects" >> ${TMPPLIST}
 	@${ECHO_CMD} "@dir(,,700) ${WWWDIR_REL}/shared/registry" >> ${TMPPLIST}
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index 89d0a45c4142..0e8f4676d38c 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,5 +1,5 @@
 GITLAB_VERSION=		17.8.0
-GITLAB_PORTREVISION=	0
+GITLAB_PORTREVISION=	1
 
 # Git version gitaly should use (from gitlab mirror)
 # Find current tag from Makefile and .gitlab-ci.yaml