From nobody Fri Nov 15 15:57:51 2024 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 4XqhW41Y4Cz5dJK1; Fri, 15 Nov 2024 15:57:52 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XqhW35dZwz4CTB; Fri, 15 Nov 2024 15:57:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731686271; 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=2jw+U6LmAmsVQoUd8QqqY02tQVINfLm4ikUYcaMsykA=; b=gWMTKDyaRp/5hUX5p5Erj3Pjh3ZOPZtBPurMXIS01j8A1nkfVCXOV9KT6tfR8cbHqz5yjI KDTrLlW0j178xM4cAbHTkEH7MTkzG7FJnjjXG9pxjhjRxFTKKRr90lYMNrgRHqhJByyfjU AAkrURZUylZ6+FIEwrY9dgR1yxuUy8/aYRPjDMKcZ5G18wB4IiVxL2tzNzvL8bdWN+k6W0 WGWrxDtTIyiPxSA/2+BHP+Jb5PTp8z/VFCUttPaCLJ9ZZDp4vLm0LMg3LHMd+ieVZeoQfl ivNb0abhxtynCqAN9JErNVrJozKjBYkxKpoTyQ6dadSmcZvEJ1HLyfXYIoDyoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731686271; 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=2jw+U6LmAmsVQoUd8QqqY02tQVINfLm4ikUYcaMsykA=; b=RJM+Yo+cS9pIEoe17gC+SJ2g8+bEJ7zXrB9dJRjfj8C6hfdZ5kAY+PWNK//OasMZ6XlBP/ a3TRQxHLUOuc41qenairpR9hG1rPYxqQE1vbbqnkkDnOkSmqrw4xQsKKjr8CFLinnkaf9L 5bW7h2lzY/ARDAl9RFUHNwRTF9/jW+p9FW/fr2FRoBUYtptxXzAMY2EVHWTQjZ+Sm76PT8 60/jKxtpBIPvTvLWpC1/xiu1F1A7n4A8T4GqYeCqsmromJHTjZ5hsiiuoBYXYSG2wzGHhS icxVOHgRVMNl67bQp15G99FLS+mm3ABIpkvzxewRnrs89W1fpBQ0ikNQO97wAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731686271; a=rsa-sha256; cv=none; b=Bwja2Ykt/UVU2h15gPmVVIShS7AGbNB9YHB/UvZvSmx6XF2QMzlM2OwHHpVpbZ7D4geZqo M/+Srby39wwcxMCQD9WZIipBka2S/hJ9pSK4sjKXb4K+mJxqhqXQKBJVktuVSbf5hUEXnF 48m0dnJ8OD9S7x42UWL2Dqei6hSWGDtY0BZ60p7TDRBUoeAAByMpeft6dgy2Sxo+zOLqkb s4eW8xrJ8HENhWOk9hy8wTOKGDrKbxWlv9m83o5fBF86jFhfM4L70aQnX2DKgnm7KSZtFO pzIzUtJNu5g4d058a9Ag4FOBKlXZk6GhyjaZe0S/qUtu50woBRL5pjQ7nY4KZA== 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 4XqhW34kwKzTxj; Fri, 15 Nov 2024 15:57:51 +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 4AFFvp54094621; Fri, 15 Nov 2024 15:57:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AFFvptM094618; Fri, 15 Nov 2024 15:57:51 GMT (envelope-from git) Date: Fri, 15 Nov 2024 15:57:51 GMT Message-Id: <202411151557.4AFFvptM094618@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: 14a4486d3361 - 2024Q4 - www/gitlab: use LOCALBASE instead of PREFIX for dirs/files not part of gitlab package 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/2024Q4 X-Git-Reftype: branch X-Git-Commit: 14a4486d3361313a5fe32c7064505608583e23e1 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=14a4486d3361313a5fe32c7064505608583e23e1 commit 14a4486d3361313a5fe32c7064505608583e23e1 Author: Matthias Fechner AuthorDate: 2024-11-02 08:08:42 +0000 Commit: Matthias Fechner CommitDate: 2024-11-15 15:56:43 +0000 www/gitlab: use LOCALBASE instead of PREFIX for dirs/files not part of gitlab package Reported by: arrowd (cherry picked from commit 55133873e62f2a8c6ecb33ac1c1f36e64059140b) --- www/gitlab/Makefile | 2 +- www/gitlab/files/gitlab.in | 4 ++-- www/gitlab/files/patch-config_gitlab.yml.example | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index ad9f4b7bfb87..0f2eae8a1f53 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -376,7 +376,7 @@ KERBEROS_RUN_DEPENDS= rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-k KERBEROS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Gemfile-kerberos-off post-patch: - ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" -e "s|%%WWWDIR%%|${WWWDIR}|" ${WRKSRC}/config/gitlab.yml.example \ + ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" -e "s|%%LOCALBASE%%|${LOCALBASE}|" -e "s|%%WWWDIR%%|${WWWDIR}|" ${WRKSRC}/config/gitlab.yml.example \ ${WRKSRC}/config/puma.rb.example \ ${WRKSRC}/lib/support/nginx/gitlab \ ${WRKSRC}/lib/support/nginx/gitlab-ssl diff --git a/www/gitlab/files/gitlab.in b/www/gitlab/files/gitlab.in index 3087d86fb25a..a386086fb70c 100644 --- a/www/gitlab/files/gitlab.in +++ b/www/gitlab/files/gitlab.in @@ -94,9 +94,9 @@ gitlab_pages_dir=$(cd $app_root/../gitlab-pages 2> /dev/null && pwd) gitlab_pages_pid_path="$pid_path/gitlab-pages.pid" gitlab_pages_options="-pages-domain example.com -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090" gitlab_pages_log="$app_root/log/gitlab-pages.log" -shell_path="%%PREFIX%%/bin/bash" +shell_path="%%LOCALBASE%%/bin/bash" gitaly_enabled=true -gitaly_dir="%%PREFIX%%/share/gitaly" +gitaly_dir="%%LOCALBASE%%/share/gitaly" gitaly_pid_path="$pid_path/gitaly.pid" gitaly_log="$app_root/log/gitaly.log" sidekiq_pid_path="$pid_path/sidekiq-cluster.pid" diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index de2730916655..872bcceb51d3 100644 --- a/www/gitlab/files/patch-config_gitlab.yml.example +++ b/www/gitlab/files/patch-config_gitlab.yml.example @@ -34,7 +34,7 @@ backup: path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) - # gitaly_backup_path: /home/git/gitaly/_build/bin/gitaly-backup # 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) ++ gitaly_backup_path: %%LOCALBASE%%/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 @@ -44,8 +44,8 @@ gitlab_shell: - path: /home/git/gitlab-shell/ - authorized_keys_file: /home/git/.ssh/authorized_keys -+ path: %%PREFIX%%/share/gitlab-shell/ -+ authorized_keys_file: %%PREFIX%%/git/.ssh/authorized_keys ++ path: %%LOCALBASE%%/share/gitlab-shell/ ++ authorized_keys_file: %%LOCALBASE%%/git/.ssh/authorized_keys # File that contains the secret key for verifying access for gitlab-shell. # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app). @@ -77,14 +77,14 @@ ## GitLab Elasticsearch settings elasticsearch: - indexer_path: /home/git/gitlab-elasticsearch-indexer/ -+ indexer_path: %%PREFIX%%/bin/ ++ indexer_path: %%LOCALBASE%%/bin/ ## Git settings # CAUTION! # Use the default values unless you really know what you are doing git: - bin_path: /usr/bin/git -+ bin_path: %%PREFIX%%/bin/git ++ bin_path: %%LOCALBASE%%/bin/git ## Webpack settings # If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running @@ -119,14 +119,14 @@ gitaly: - client_path: tmp/tests/gitaly/_build/bin -+ client_path: %%PREFIX%%/share/gitaly/bin ++ client_path: %%LOCALBASE%%/share/gitaly/bin 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 ++ gitaly_backup_path: %%LOCALBASE%%/share/gitaly/bin/gitaly-backup gitlab_shell: path: tmp/tests/gitlab-shell/ authorized_keys_file: tmp/tests/authorized_keys