From nobody Fri Jan 17 16:08:32 2025 X-Original-To: dev-commits-ports-main@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 4YZPmJ2c2xz5l896; Fri, 17 Jan 2025 16:08:32 +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 4YZPmJ1Bq1z49W0; Fri, 17 Jan 2025 16:08:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737130112; 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=jYvV/Gb1GAdRkbPdPYXTiqAQNXXayhcX0Mst3JZAeUc=; b=RfbnJz/SrCz1zS94mMLt0dA/mwnE+4y5iTdTTrx00bqCrCSb6tQgtE+E5FqGNvl5gUvPiO Bhvn2glV/ioYHiS3JqPrxX7lxtafhTjYOYqdzbMCD/PCqN0tbwjtluFzvvoE8umcKZS55X ut8uNo2yDg38V+jdwewzv6WeKmTcCwA8GSK6HQty6X/8nCJX1tkxzgLcORPdK73tyhefJW cXR/+o6VKAcXhUEZeBv8fXWYXVTIV3iDmWiga4qwIWwe+i3j0qF69rwEmtO2BYgLiSGwKF F0dv9hZIPVjH4UaqxNtOfevneqmgP1GcDXvERaUx3UiCj78UEpmxkFIEoi8GMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737130112; 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=jYvV/Gb1GAdRkbPdPYXTiqAQNXXayhcX0Mst3JZAeUc=; b=IhscHgx72eZlWW24QeJPDWNHA6dVV/4j6s6SbhPhA8S8jD4D1s/cdTFCe1EHGb1DRL0Q5w 2X9igTgWn/HsRrAqwa2fbVLRz7qtGX2i54eYOjFxlmfZXe6H/se7/hCwZjn2qtmCSo0Jy4 EKcLIPZYa/CpxwU99v8/Q76moD/bh8iYsNuTOu9g7ubsyAKE7Ev/kbIigrH8nqnM+51BE3 Vbg9xYbD+4jLWWrhJ3nXzPg3GNhCJDrpuBOAyhB2AEzoeUFDpE4XI3V5JibogFElsLMxFY oIyUnjkcYjYg57u5xattr9VNeNR5TnT/SIkLTMqU/D6mGLrrkEGpl34K+mABGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737130112; a=rsa-sha256; cv=none; b=MOp3iuDkPDngZQNHdxvPa5ZR4/EtDQApbbKRLh+q+SG90znKBYZsWOt7ppHrMsA+whu8wP IUHGZRSjceij205HQkZshtHBbWQmvLDua9LM7QledguPvLT5CqOGZ6NYCa5AdW5/XuznrP ih5a2nZn8S2j1WN3KkFggaXz2xLoDSoDhBxucWxHkOLKaGxD3oBphX4h0hjglQSzFrXbQS WIdjt9Wrf7RXHYLxV1oDI6v5nBNo1wfMm7iwkudq9Ke/t6U5kXXpFDX/mMxpcdnwmRCFoq XiZVUNmMVw+tJnVoI23tL9TJ/H314gHEwhDJC6N/uXqrzOK7/eEdCvs/dTi40g== 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 4YZPmJ0hVwz8rY; Fri, 17 Jan 2025 16:08:32 +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 50HG8WSi068060; Fri, 17 Jan 2025 16:08:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HG8W6E068057; Fri, 17 Jan 2025 16:08:32 GMT (envelope-from git) Date: Fri, 17 Jan 2025 16:08:32 GMT Message-Id: <202501171608.50HG8W6E068057@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 38e7302dd7c9 - main - www/gitlab: fixed permission database.yml and failing backup List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 38e7302dd7c93a362d422c3cc24986d369a7ef00 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=38e7302dd7c93a362d422c3cc24986d369a7ef00 commit 38e7302dd7c93a362d422c3cc24986d369a7ef00 Author: Matthias Fechner AuthorDate: 2025-01-17 13:42:58 +0000 Commit: Matthias Fechner CommitDate: 2025-01-17 16:08:23 +0000 www/gitlab: fixed permission database.yml and failing backup --- 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