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

5 files changed, 21 insertions, 21 deletions

diff --git a/www/gitlab/files/gitlab.in b/www/gitlab/files/gitlab.in
index 1783a33acda9..bf1410ac5058 100644
--- a/www/gitlab/files/gitlab.in
+++ b/www/gitlab/files/gitlab.in
@@ -68,7 +68,7 @@ esac
 # Script variable names should be lower-case not to conflict with
 # internal /bin/sh variables such as PATH, EDITOR or SHELL.
 app_user="git"
-app_root="%%PREFIX%%/www/gitlab-ce"
+app_root="%%WWWDIR%%"
 pid_path="$app_root/tmp/pids"
 socket_path="$app_root/tmp/sockets"
 rails_socket="$socket_path/gitlab.socket"
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
diff --git a/www/gitlab/files/patch-config_puma.rb.example b/www/gitlab/files/patch-config_puma.rb.example
index ca75ff90f250..a7cf2c2ced7e 100644
--- a/www/gitlab/files/patch-config_puma.rb.example
+++ b/www/gitlab/files/patch-config_puma.rb.example
@@ -1,4 +1,4 @@
---- config/puma.rb.example.orig	2023-10-20 08:41:39 UTC
+--- config/puma.rb.example.orig	2024-04-09 16:46:13 UTC
 +++ config/puma.rb.example
 @@ -5,11 +5,11 @@
  # The default is "config.ru".
@@ -6,13 +6,13 @@
  rackup 'config.ru'
 -pidfile '/home/git/gitlab/tmp/pids/puma.pid'
 -state_path '/home/git/gitlab/tmp/pids/puma.state'
-+pidfile '%%PREFIX%%/www/gitlab-ce/tmp/pids/puma.pid'
-+state_path '%%PREFIX%%/www/gitlab-ce/tmp/pids/puma.state'
++pidfile '%%WWWDIR%%/tmp/pids/puma.pid'
++state_path '%%WWWDIR%%/tmp/pids/puma.state'
  
 -stdout_redirect '/home/git/gitlab/log/puma.stdout.log',
 -  '/home/git/gitlab/log/puma.stderr.log',
-+stdout_redirect '%%PREFIX%%/www/gitlab-ce/log/puma.stdout.log',
-+  '%%PREFIX%%/www/gitlab-ce/log/puma.stderr.log',
++stdout_redirect '%%WWWDIR%%/log/puma.stdout.log',
++  '%%WWWDIR%%/log/puma.stderr.log',
    true
  
  # Configure "min" to be the minimum number of threads to use to answer
@@ -21,12 +21,12 @@
  # Bind the server to "url". "tcp://", "unix://" and "ssl://" are the only
  # accepted protocols.
 -bind 'unix:///home/git/gitlab/tmp/sockets/gitlab.socket'
-+bind 'unix://%%PREFIX%%/www/gitlab-ce/tmp/sockets/gitlab.socket'
++bind 'unix://%%WWWDIR%%/tmp/sockets/gitlab.socket'
  
  workers 3
  
 -require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events"
-+require_relative "%%PREFIX%%/www/gitlab-ce/lib/gitlab/cluster/lifecycle_events"
++require_relative "%%WWWDIR%%/lib/gitlab/cluster/lifecycle_events"
  
  on_restart do
    # Signal application hooks that we're about to restart
@@ -35,7 +35,7 @@
  
  # Use json formatter
 -require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter"
-+require_relative "%%PREFIX%%/www/gitlab-ce/lib/gitlab/puma_logging/json_formatter"
++require_relative "%%WWWDIR%%/lib/gitlab/puma_logging/json_formatter"
  
  json_formatter = Gitlab::PumaLogging::JSONFormatter.new
  log_formatter do |str|
@@ -43,7 +43,7 @@
  end
  
 -require_relative "/home/git/gitlab/lib/gitlab/puma/error_handler"
-+require_relative "%%PREFIX%%/www/gitlab-ce/lib/gitlab/puma/error_handler"
++require_relative "%%WWWDIR%%/lib/gitlab/puma/error_handler"
  
  error_handler = Gitlab::Puma::ErrorHandler.new(ENV['RAILS_ENV'] == 'production')
  
diff --git a/www/gitlab/files/patch-lib_support_nginx_gitlab b/www/gitlab/files/patch-lib_support_nginx_gitlab
index 5eaaaf9163d3..ba44e58e7372 100644
--- a/www/gitlab/files/patch-lib_support_nginx_gitlab
+++ b/www/gitlab/files/patch-lib_support_nginx_gitlab
@@ -1,11 +1,11 @@
---- lib/support/nginx/gitlab.orig	2020-11-20 12:00:55 UTC
+--- lib/support/nginx/gitlab.orig	2024-04-09 16:46:13 UTC
 +++ lib/support/nginx/gitlab
 @@ -19,7 +19,7 @@
  upstream gitlab-workhorse {
    # GitLab socket file,
    # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/sockets/socket
 -  server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
-+  server unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
++  server unix:%%WWWDIR%%/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
  }
  
  map $http_upgrade $connection_upgrade_gitlab {
@@ -14,7 +14,7 @@
      # Location to the GitLab's public directory,
      # for Omnibus this would be: /opt/gitlab/embedded/service/gitlab-rails/public.
 -    root /home/git/gitlab/public;
-+    root %%PREFIX%%/www/gitlab-ce/public;
++    root %%WWWDIR%%/public;
      internal;
    }
  
diff --git a/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl b/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl
index cdcc25d5e278..87393c3aebaa 100644
--- a/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl
+++ b/www/gitlab/files/patch-lib_support_nginx_gitlab-ssl
@@ -1,11 +1,11 @@
---- lib/support/nginx/gitlab-ssl.orig	2023-04-05 16:11:51 UTC
+--- lib/support/nginx/gitlab-ssl.orig	2024-04-09 16:46:13 UTC
 +++ lib/support/nginx/gitlab-ssl
 @@ -23,7 +23,7 @@
  upstream gitlab-workhorse {
    # GitLab socket file,
    # for Omnibus this would be: unix:/var/opt/gitlab/gitlab-workhorse/sockets/socket
 -  server unix:/home/git/gitlab/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
-+  server unix:%%PREFIX%%/www/gitlab-ce/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
++  server unix:%%WWWDIR%%/tmp/sockets/gitlab-workhorse.socket fail_timeout=0;
  }
  
  map $http_upgrade $connection_upgrade_gitlab_ssl {
@@ -14,7 +14,7 @@
      # Location to the GitLab's public directory,
      # for Omnibus this would be: /opt/gitlab/embedded/service/gitlab-rails/public
 -    root /home/git/gitlab/public;
-+    root %%PREFIX%%/www/gitlab-ce/public;
++    root %%WWWDIR%%/public;
      internal;
    }
  }