git: 14a4486d3361 - 2024Q4 - www/gitlab: use LOCALBASE instead of PREFIX for dirs/files not part of gitlab package

The branch 2024Q4 has been updated by mfechner:

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

commit 14a4486d3361313a5fe32c7064505608583e23e1
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2024-11-02 08:08:42 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
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