From nobody Thu Jan 23 10:00:36 2025 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YdxK14PmFz5lwGH; Thu, 23 Jan 2025 10:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YdxK065nCz3twc; Thu, 23 Jan 2025 10:00:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737626436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D13g4NOO+P6EvTU8q9aGu0yfQ2RhWdn+UWvyAaRq43g=; b=rS+EcHmWFIoElb6wgn3hjpiTZX/jQq7ugYakrkWOsK+7RGSI/e/FTP5vnkFwQymCFTd1t8 oeaGYTzUvbuNVII/TuIeOVMOgRcUR0Ip3Eg3oZXfCYeB4boUOWM6+ONMMoiSSN6CEZ+BMi wpizdh5Dd+gVb7Ylp3VR5mxDgdOMgp1+CkhfJB0LnThfHr8WbkneD8Te/bhY+D1dpDtS0A crKs4sjEbGlYIkokGbIdAdHuOJ2jmpEtHBpv7Cwj5dIBii90HaWb6i39wS2yUa9aEP1YY+ b8MFFw3pvWXs6X1DmsLQ4EVv7PzhX9A6VS8ZacORNGjWefx55TyT4LEesqGqwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737626436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D13g4NOO+P6EvTU8q9aGu0yfQ2RhWdn+UWvyAaRq43g=; b=pmzcCu7XnbvW9Y5lXSWHIVWeXqivnngYhKZQpzpF0CgFOO/1St6BcOT+LydJUPIjp2ZkPc Elgb249Hi3eJvy8Ek9YOpRK6QF2LAesvHpuW1j3vd+2Cpk1fxZXevdM3TrwMw3Vtx//VZF fytXtviXe0PWRTDOZ0G1P0lMVRZWTFjjSw8ovwtg4VBSBy1V7QZp633M1JZ8tIcbKVEtA/ 0K+Lm7Kbh/g/Y4+qsmvbpPi4XgnACPzGwMBJaPyq48A1ck7q0K1foKIz9uk08g5C7kSzrB 30Kw7gKMOcvloqL5lFuShHWOA5cQ7J0/fQT6kqymAiFaIppkFs/aTDLyRWaJXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737626436; a=rsa-sha256; cv=none; b=LK7MvUhEzpoob7D6A6av9mARKiORDTft5nbKYiX+IvunqHW6Ng96YxRKIH2v1rSe+dNraZ Ioj/V/grNWUfw0ILkqht7829kA3pVegKzDVUGc/0f7RSMgXmVfewqSYuzPuTWy90ydTQE4 lPNbdJwS3Shh3AEl8sZijb8+YUy0YtpAS/rb2CEFacfLUdS7W6LT2VS7BDdf4ublYRE9CX eWWD3BUpDDS6LMOG4nv5ybnxbqKeXtCln+i8+rxNyZB5LKlVhw7729S2gqUsOK07zuUvhj RasVGnjCpLAL1LCCVkSjqc8avPnbwUssTV7WyK9HdAFMFg16+I5LkKQpV/9w3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YdxK05b0Czb7h; Thu, 23 Jan 2025 10:00:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50NA0a8s087768; Thu, 23 Jan 2025 10:00:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50NA0aj3087765; Thu, 23 Jan 2025 10:00:36 GMT (envelope-from git) Date: Thu, 23 Jan 2025 10:00:36 GMT Message-Id: <202501231000.50NA0aj3087765@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: bc45fb4f772e - 2025Q1 - www/gitlab: fixed permission database.yml and failing backup List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: bc45fb4f772e893dc533fdf159c522432a2ea276 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=bc45fb4f772e893dc533fdf159c522432a2ea276 commit bc45fb4f772e893dc533fdf159c522432a2ea276 Author: Matthias Fechner AuthorDate: 2025-01-17 13:42:58 +0000 Commit: Matthias Fechner 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