From nobody Tue Oct 5 10:15:34 2021 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 325E812DC74B; Tue, 5 Oct 2021 10:15:35 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HNtkv0mlxz4lCh; Tue, 5 Oct 2021 10:15:35 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 EEB6D2D84; Tue, 5 Oct 2021 10:15:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 195AFYNI056396; Tue, 5 Oct 2021 10:15:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 195AFY7M056395; Tue, 5 Oct 2021 10:15:34 GMT (envelope-from git) Date: Tue, 5 Oct 2021 10:15:34 GMT Message-Id: <202110051015.195AFY7M056395@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: ae9c04d9402d - 2021Q4 - www/gitlab-ce: fix default backup configuration 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: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: ae9c04d9402d301333632788cbb058f4209916b1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=ae9c04d9402d301333632788cbb058f4209916b1 commit ae9c04d9402d301333632788cbb058f4209916b1 Author: Matthias Fechner AuthorDate: 2021-10-02 08:48:14 +0000 Commit: Matthias Fechner CommitDate: 2021-10-05 10:15:28 +0000 www/gitlab-ce: fix default backup configuration PR: 258922 (cherry picked from commit 2c47b503373d7c6c29cf94a2756f4179828f60c0) --- www/gitlab-ce/Makefile | 3 +-- www/gitlab-ce/files/patch-config_gitlab.yml.example | 20 +++++++++++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 5cd7434ee967..eaf4bd59dc9d 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -2,7 +2,7 @@ PORTNAME= gitlab-ce PORTVERSION= 14.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -395,7 +395,6 @@ post-install: @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets/private" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/tmp/sockets/private/internal" >> ${TMPPLIST} - @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor/assets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/vendor/assets/stylesheets" >> ${TMPPLIST} @${ECHO_CMD} "@dir(,,770) ${WWWDIR_REL}/workhorse/changelogs/unreleased" >> ${TMPPLIST} diff --git a/www/gitlab-ce/files/patch-config_gitlab.yml.example b/www/gitlab-ce/files/patch-config_gitlab.yml.example index fab515d68357..6c9974f4a7df 100644 --- a/www/gitlab-ce/files/patch-config_gitlab.yml.example +++ b/www/gitlab-ce/files/patch-config_gitlab.yml.example @@ -1,6 +1,6 @@ ---- config/gitlab.yml.example.orig 2021-09-21 10:06:28 UTC +--- config/gitlab.yml.example.orig 2021-10-01 16:06:26 UTC +++ config/gitlab.yml.example -@@ -1128,8 +1128,8 @@ production: &base +@@ -1128,14 +1128,14 @@ production: &base # real path not the symlink. storages: # You must have at least a `default` storage path. default: @@ -11,6 +11,13 @@ # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings + backup: + path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) +- # gitaly_backup_path: # Path of the gitaly-backup binary (default: searches $PATH) ++ gitaly_backup_path: %%PREFIX%%/share/gitaly/bin/gitaly-backup # Path of the gitaly-backup binary (default: searches $PATH) + # archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600) + # keep_time: 604800 # default: 0 (forever) (in seconds) + # pg_schema: public # default: nil, it means that all schemas will be backed up @@ -1184,12 +1184,12 @@ production: &base ## GitLab Shell settings @@ -59,7 +66,7 @@ ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running -@@ -1453,7 +1453,7 @@ test: +@@ -1453,13 +1453,13 @@ test: gitaly_address: unix:tmp/tests/gitaly/praefect.socket gitaly: @@ -68,3 +75,10 @@ token: secret workhorse: secret_file: tmp/gitlab_workhorse_test_secret + backup: + path: tmp/tests/backups +- gitaly_backup_path: tmp/tests/gitaly/_build/bin/gitaly-backup ++ gitaly_backup_path: %%PREFIX%%/share/gitaly/bin/gitaly-backup + pseudonymizer: + manifest: config/pseudonymizer.yml + upload: