From e47b43119c5d0367354238887bbc2e40e2ac76a9 Mon Sep 17 00:00:00 2001 From: Matthias Fechner Date: Fri, 12 Apr 2024 10:49:13 +0300 Subject: www/gitlab: add flavor support to also support the EE version By default the port will build the CE edition. If you use pkg, you will install it as usual with: pkg install gitlab-ce If you need the EE edition you can install it with: pkg install gitlab-ee --- www/gitlab/files/patch-config_gitlab.yml.example | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'www/gitlab/files/patch-config_gitlab.yml.example') diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example index 1b5556be240b..ee3fd11e206b 100644 --- a/www/gitlab/files/patch-config_gitlab.yml.example +++ b/www/gitlab/files/patch-config_gitlab.yml.example @@ -1,4 +1,4 @@ ---- config/gitlab.yml.example.orig 2024-02-14 14:42:02 UTC +--- config/gitlab.yml.example.orig 2024-04-09 16:46:13 UTC +++ config/gitlab.yml.example @@ -463,7 +463,7 @@ production: &base ## GitLab Pages @@ -27,7 +27,7 @@ storages: # You must have at least a `default` storage path. default: - gitaly_address: unix:/home/git/gitlab/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). -+ gitaly_address: unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). ++ gitaly_address: unix:%%WWWDIR%%/tmp/sockets/private/gitaly.socket # TCP connections are supported too (e.g. tcp://host:port). TLS connections are also supported using the system certificate pool (eg: tls://host:port). # gitaly_token: 'special token' # Optional: override global gitaly.token for this storage. ## Backup settings @@ -50,7 +50,7 @@ # 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). - # secret_file: /home/git/gitlab/.gitlab_shell_secret -+ # secret_file: %%PREFIX%%/www/gitlab-ce/.gitlab_shell_secret ++ # secret_file: %%WWWDIR%%/.gitlab_shell_secret # Git over HTTP upload_pack: true @@ -59,14 +59,14 @@ # File that contains the secret key for verifying access for gitlab-workhorse. # Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app). - # secret_file: /home/git/gitlab/.gitlab_workhorse_secret -+ # secret_file: %%PREFIX%%/www/gitlab-ce/.gitlab_workhorse_secret ++ # secret_file: %%WWWDIR%%/.gitlab_workhorse_secret gitlab_kas: # enabled: true # File that contains the secret key for verifying access for gitlab-kas. # Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app). - # secret_file: /home/git/gitlab/.gitlab_kas_secret -+ # secret_file: %%PREFIX%%/www/gitlab-ce/.gitlab_kas_secret ++ # secret_file: %%WWWDIR%%/.gitlab_kas_secret # The URL to the external KAS API (used by the Kubernetes agents) # external_url: wss://kas.example.com -- cgit v1.2.3