From nobody Tue Apr 23 15:30:50 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 4VP5fy3lQsz5HSwq; Tue, 23 Apr 2024 15:30:50 +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 4VP5fy2sR6z41JR; Tue, 23 Apr 2024 15:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713886250; 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=MePA8Tvoed0Wky5d2WAhesqPKSTjEWnmsc4BK5tQ/xk=; b=XFL3MDfxC+KZe/35VcUuWTNjABDQOP0xKUbOdRBond8E07TwMrLdA0mJB/9OAKp8vCiZhY DX0lemu8TsH3OLmPbjeHa3KL2Eq7FNGyOvwnw8Y3Ijg47XuuFRSI8O326P4n+GWNwEJuVz z+xGdqg6Xpg4S4YwbjUWxLEEpZPM5WYLL/y5mDAt50D/PkCfTyrg3ulP8M8GvW/DjfHUqe 69LibdG9rZGoyHMx/OKuKpkHT8eUuHlOu/7FgQ3weiAswFh7q8wBKqRMtop3ZOKMT4RS6R /7pnuO9pVoyLnBUvPEwGHH0NoddpBMWpPH9jGkLWNTxSCr+H4AQsclWZXEMWQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713886250; a=rsa-sha256; cv=none; b=WFcwcVVDJ6GWj/J4SugKLC7LmfFapygpRDQf3yxZ7MgeXyz1+qqxyKfPYNBIxI/8AkK/uq 82UUulEwUO333TTZVPWyw8/kjACUEocFkBKJvwQuw5jXPKCkmYWgL31/jsvFoimQOtNzxG asoWqWH+TkVbbUPQk3UH/+NRGRo8Ayrv0lj0GyrCeonuyRX+dg+BfyBHT2PqVvCnwal5RR VxgJbRB/hlN3YtYYvc/mVK433fVQm1In1EE7B39yDjN3qhC02DsJJSx2OO2tulOaKfh5Qm YiLtflnjjXj5ROfWCVVD7TtWnPwSoUtvBGJN4iYyooppbhZzyupnVh2FJMynaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713886250; 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=MePA8Tvoed0Wky5d2WAhesqPKSTjEWnmsc4BK5tQ/xk=; b=VhHFfuUcYSjrUAO2d2BcjM9gN3z25BzWO0lefvtuaW+GclBe7VD13LggIWPQ/o43KY/+h7 txiUEWZLuzHrbqeGyQOEdPW3YhT082tRevgEjcQhPx54buN3DxnHi/0TGlE4fxA/2mUOdL 1sgKmaq2AiYkUuF0E/v7MlDrD3zk1pEKtm3ArUISbyI5fVhzNRXiMK8I0jP7SpRPmEgzJm DlGp/P+CWs32AVfNOYqlpIqCoJfE7z2GeE7qCfzQGRNFgkQGiBrv3U32XUhOz/RjHudKRe 6VAPDL2Vn+oH8sa6RNegMJtIABlFY8CSbaMY4V8xciTK0VPUfv9yALPcVCMUNA== 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 4VP5fy2TgRzcyd; Tue, 23 Apr 2024 15:30:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43NFUoN5045692; Tue, 23 Apr 2024 15:30:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43NFUoCM045689; Tue, 23 Apr 2024 15:30:50 GMT (envelope-from git) Date: Tue, 23 Apr 2024 15:30:50 GMT Message-Id: <202404231530.43NFUoCM045689@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: d2bceac4e3af - 2024Q2 - www/gitlab: add flavor support to also support the EE version 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/2024Q2 X-Git-Reftype: branch X-Git-Commit: d2bceac4e3af3799b2c4364b8c420b9aecf4be7e Auto-Submitted: auto-generated The branch 2024Q2 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=d2bceac4e3af3799b2c4364b8c420b9aecf4be7e commit d2bceac4e3af3799b2c4364b8c420b9aecf4be7e Author: Matthias Fechner AuthorDate: 2024-04-12 07:49:13 +0000 Commit: Matthias Fechner CommitDate: 2024-04-23 15:30:41 +0000 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 (cherry picked from commit e47b43119c5d0367354238887bbc2e40e2ac76a9) --- MOVED | 3 +- devel/gitaly/files/patch-config.toml.example | 6 +- devel/gitlab-shell/Makefile | 1 + devel/gitlab-shell/files/patch-config.yml.example | 11 ++-- www/gitlab-workhorse/Makefile | 4 -- www/gitlab/Makefile | 76 +++++++++++++++------- www/gitlab/distinfo | 5 +- www/gitlab/files/gitlab.in | 2 +- www/gitlab/files/patch-config_gitlab.yml.example | 10 +-- www/gitlab/files/patch-config_puma.rb.example | 18 ++--- www/gitlab/files/patch-lib_support_nginx_gitlab | 6 +- .../files/patch-lib_support_nginx_gitlab-ssl | 6 +- 12 files changed, 89 insertions(+), 59 deletions(-) diff --git a/MOVED b/MOVED index e038af03ab0a..eca2bc53e58d 100644 --- a/MOVED +++ b/MOVED @@ -3161,4 +3161,5 @@ devel/dmucs||2024-04-06|Has expired: Unmaintained, upstream last release was in multimedia/mjpg-streamer||2024-04-06|Has expired: Unmaintained for a long time and does not work irc/tircproxy||2024-04-06|Has expired: Unmaintained, dead upstream, vaporized from the net devel/ds2||2024-04-06|Has expired: Upstream deprecated and archived -deve/bazel029||2024-04-08|Removed +devel/bazel029||2024-04-08|Removed +www/gitlab-ce|www/gitlab@ce|2024-04-21|Move www/gitlab-ce to www/gitlab and added flavor ce and ee diff --git a/devel/gitaly/files/patch-config.toml.example b/devel/gitaly/files/patch-config.toml.example index a2098b52a366..1ade94b72f95 100644 --- a/devel/gitaly/files/patch-config.toml.example +++ b/devel/gitaly/files/patch-config.toml.example @@ -5,7 +5,7 @@ # A path which Gitaly should open a Unix socket. -socket_path = "/home/git/gitlab/tmp/sockets/private/gitaly.socket" -+socket_path = "%%PREFIX%%/www/gitlab-ce/tmp/sockets/private/gitaly.socket" ++socket_path = "%%PREFIX%%/www/gitlab/tmp/sockets/private/gitaly.socket" # Directory containing Gitaly executables. -bin_dir = "/home/git/gitaly/_build/bin" @@ -44,7 +44,7 @@ -dir = "/home/git/gitlab/log" +[logging] +# Directory where Gitaly stores extra log files. -+dir = "%%PREFIX%%/www/gitlab-ce/log" ++dir = "%%PREFIX%%/www/gitlab/log" # # Log format. Either 'text' or 'json'. # format = "json" # # Optional. Set log level to only log entries with that severity or above. @@ -59,7 +59,7 @@ [gitlab] # # URL of the GitLab server. -url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" -+url = "http+unix://%2Fusr%2Flocal%2Fwww%2Fgitlab-ce%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" ++url = "http+unix://%2Fusr%2Flocal%2Fwww%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" # # 'relative_url_root' is only needed if a UNIX socket is used in 'url' and GitLab is configured to # # use a relative path. For example, '/gitlab'. # relative_url_root = '/' diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile index 0f5576b95e7d..a28ecdb801fb 100644 --- a/devel/gitlab-shell/Makefile +++ b/devel/gitlab-shell/Makefile @@ -50,6 +50,7 @@ VARLOGDIR= /var/log/gitlab-shell PLIST_FILES+= "@dir(git,,755) ${VARLOGDIR}" post-patch: + ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.yml.example ${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample ${CP} ${WRKSRC}/config.yml.sample ${WRKSRC}/config.yml ${REINPLACE_CMD} -e 's|VERSION_STRING :=.*|VERSION_STRING := v${PORTVERSION}|g' ${WRKSRC}/Makefile diff --git a/devel/gitlab-shell/files/patch-config.yml.example b/devel/gitlab-shell/files/patch-config.yml.example index eaf2bf2a1f16..6531d74f89ee 100644 --- a/devel/gitlab-shell/files/patch-config.yml.example +++ b/devel/gitlab-shell/files/patch-config.yml.example @@ -1,11 +1,11 @@ ---- config.yml.example.orig 2024-01-19 10:36:34 UTC +--- config.yml.example.orig 2024-04-14 08:08:44 UTC +++ config.yml.example @@ -13,7 +13,7 @@ user: git # only listen on a Unix domain socket. For Unix domain sockets use # "http+unix://", e.g. # "http+unix://%2Fpath%2Fto%2Fsocket" -gitlab_url: "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" -+gitlab_url: "http+unix://%2Fusr%2Flocal%2Fwww%2Fgitlab-ce%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" ++gitlab_url: "http+unix://%2Fusr%2Flocal%2Fwww%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" # When a http+unix:// is used in gitlab_url, this is the relative URL root to GitLab. # Not used if gitlab_url is http:// or https://. @@ -14,15 +14,14 @@ # File used as authorized_keys for gitlab user -auth_file: "/home/git/.ssh/authorized_keys" -+auth_file: "/usr/local/git/.ssh/authorized_keys" ++auth_file: "%%PREFIX%%/git/.ssh/authorized_keys" # SSL certificate dir where custom certificates can be placed # https://golang.org/pkg/crypto/x509/ -@@ -45,7 +45,7 @@ auth_file: "/home/git/.ssh/authorized_keys" - +@@ -46,6 +46,7 @@ auth_file: "/home/git/.ssh/authorized_keys" # Log file. # Default is gitlab-shell.log in the root directory. --# log_file: "/home/git/gitlab-shell/gitlab-shell.log" + # log_file: "/home/git/gitlab-shell/gitlab-shell.log" +log_file: "/var/log/gitlab-shell/gitlab-shell.log" # Log level. INFO by default diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index f8f4e5c3e1ed..f1de493ba375 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -42,13 +42,9 @@ go-post-fetch: ${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all) # --------------------------- -PLIST_DIRS= ${WWWDIR} PLIST_FILES= bin/gitlab-resize-image \ bin/gitlab-workhorse \ bin/gitlab-zip-cat \ bin/gitlab-zip-metadata -post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME} - .include diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile index 17a2c6f3120e..768348c8eda2 100644 --- a/www/gitlab/Makefile +++ b/www/gitlab/Makefile @@ -1,7 +1,10 @@ -PORTNAME= gitlab-ce +PORTNAME= gitlab-${FLAVOR:Uce} PORTVERSION= 16.10.2 DISTVERSIONPREFIX= v -PORTREVISION= 1 +.if ${FLAVOR:U} == ee +DISTVERSIONSUFFIX= -ee +.endif + CATEGORIES= www devel # include patch to fix database migration @@ -286,11 +289,19 @@ BUILD_DEPENDS= gem:devel/ruby-gems \ RUN_DEPENDS= ${MY_DEPENDS} -USES= go:modules nodejs:env ruby shebangfix +FLAVORS= ce ee +FLAVOR?= ${FLAVORS:[1]} + +USES= nodejs:env ruby shebangfix USE_GITLAB= yes GL_ACCOUNT= gitlab-org +.if ${FLAVOR:U} == ee +GL_PROJECT= gitlab +.else # ce GL_PROJECT= gitlab-foss +.endif + USE_RC_SUBR= gitlab SHEBANG_FILES= scripts/build_qa_image \ @@ -312,6 +323,8 @@ CONFLICTS_INSTALL= gitolite \ gitea \ gitosis +# We install the CE and EE flavor in the same directory +WWWDIR= ${PREFIX}/www/gitlab NO_ARCH= yes NO_BUILD= yes @@ -326,7 +339,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}|" ${WRKSRC}/config/gitlab.yml.example \ + ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" -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 @@ -338,40 +351,40 @@ do-install: ${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample (cd ${WRKSRC} && ${RM} Gemfile.lock && bundle install --local) ${RM} -R ${WRKSRC}/workhorse - # Has only a Gemfile.lock, so remove it, is maybe fixed by a newer version - ${RM} -R ${WRKSRC}/vendor/gems/omniauth-google-oauth2 ${FIND} ${WRKSRC} -name '*.orig' -delete ${FIND} ${WRKSRC} -name '*.bak' -delete ${FIND} ${WRKSRC} -name '*.gitkeep' -delete ${FIND} ${WRKSRC} -name '*.gitignore' -delete ${FIND} ${WRKSRC} -name "Gemfile.lock" -delete ${MV} ${WRKSRC}/config/initializers/relative_url.rb.sample ${WRKSRC}/config/initializers/relative_url.rb.example - # get files for workdir with: find . -name "*.example" - ${MV} ${WRKSRC}/config/puma.rb.example ${WRKSRC}/config/puma.rb.sample - ${MV} ${WRKSRC}/config/secrets.yml.example ${WRKSRC}/config/secrets.yml.sample - ${MV} ${WRKSRC}/config/sidekiq.yml.example ${WRKSRC}/config/sidekiq.yml.sample + # get files for workdir with: find . -name "*.example" | sort ${MV} ${WRKSRC}/config/cable.yml.example ${WRKSRC}/config/cable.yml.sample ${MV} ${WRKSRC}/config/gitlab.yml.example ${WRKSRC}/config/gitlab.yml.sample ${MV} ${WRKSRC}/config/initializers/devise_password_length.rb.example ${WRKSRC}/config/initializers/devise_password_length.rb.sample + ${MV} ${WRKSRC}/config/puma.rb.example ${WRKSRC}/config/puma.rb.sample + ${MV} ${WRKSRC}/config/redis.yml.example ${WRKSRC}/config/redis.yml.sample ${MV} ${WRKSRC}/config/resque.yml.example ${WRKSRC}/config/resque.yml.sample + ${MV} ${WRKSRC}/config/secrets.yml.example ${WRKSRC}/config/secrets.yml.sample + ${MV} ${WRKSRC}/config/session_store.yml.example ${WRKSRC}/config/session_store.yml.sample + ${MV} ${WRKSRC}/config/sidekiq.yml.example ${WRKSRC}/config/sidekiq.yml.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab ${WRKSRC}/lib/support/nginx/gitlab.sample ${MV} ${WRKSRC}/lib/support/nginx/gitlab-ssl ${WRKSRC}/lib/support/nginx/gitlab-ssl.sample ${MV} ${WRKSRC}/public/robots.txt ${WRKSRC}/public/robots.txt.sample - ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/app/assets/builds - ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/assets - ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/public/uploads - ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/cache - ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/sessions - ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/backups - ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/tmp/sockets/private/internal - ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/tmp - ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/artifacts/tmp/work - ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/vendor/assets/stylesheets - ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/workhorse/changelogs/unreleased + ${MKDIR} ${STAGEDIR}${WWWDIR}/app/assets/builds + ${MKDIR} ${STAGEDIR}${WWWDIR}/public/assets + ${MKDIR} ${STAGEDIR}${WWWDIR}/public/uploads + ${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/cache + ${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/sessions + ${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/backups + ${MKDIR} ${STAGEDIR}${WWWDIR}/tmp/sockets/private/internal + ${MKDIR} ${STAGEDIR}${WWWDIR}/shared/tmp + ${MKDIR} ${STAGEDIR}${WWWDIR}/shared/artifacts/tmp/work + ${MKDIR} ${STAGEDIR}${WWWDIR}/vendor/assets/stylesheets + ${MKDIR} ${STAGEDIR}${WWWDIR}/workhorse/changelogs/unreleased # Skip file having an executable bit - (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME} "-not ( -type f -perm -a=x )") + (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR} "-not ( -type f -perm -a=x )") # now copy all files having an execution bit and preserve to x bit (this fixes some issues we saw) - (cd ${WRKSRC} && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/www/${PORTNAME} "-type f -perm -a=x") + (cd ${WRKSRC} && ${COPYTREE_BIN} . ${STAGEDIR}${WWWDIR} "-type f -perm -a=x") post-install: ${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ @@ -459,5 +472,22 @@ post-install: @${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} +.if ${FLAVOR:U} == ee + # Gitlab-ee version + @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/gems/gitlab-backup-cli/tmp" >> ${TMPPLIST} + @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/4_verify" >> ${TMPPLIST} + @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/5_package" >> ${TMPPLIST} + @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/6_release" >> ${TMPPLIST} + @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/8_monitor" >> ${TMPPLIST} + @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/browser_ui/7_configure" >> ${TMPPLIST} +.endif + +.if !defined(_GITLAB_MAKESUM_GUARD) +makesum: + ${MAKE} -D_GITLAB_MAKESUM_GUARD makesum DISTINFO_FILE=${.CURDIR}/distinfo FLAVOR=ce + ${MAKE} -D_GITLAB_MAKESUM_GUARD makesum DISTINFO_FILE=${.CURDIR}/distinfo.ee FLAVOR=ee + ${CAT} ${.CURDIR}/distinfo.ee >> ${.CURDIR}/distinfo + ${RM} ${.CURDIR}/distinfo.ee +.endif .include diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo index a097d6a3fc85..63cadb329bc1 100644 --- a/www/gitlab/distinfo +++ b/www/gitlab/distinfo @@ -1,3 +1,6 @@ -TIMESTAMP = 1712813287 +TIMESTAMP = 1712907601 SHA256 (gitlab-foss-v16.10.2.tar.bz2) = 117c12aa5ef92a1f0e8e5027ee0f44694aabb5b9948636de4b3c2d495af3b61b SIZE (gitlab-foss-v16.10.2.tar.bz2) = 101864036 +TIMESTAMP = 1712907527 +SHA256 (gitlab-v16.10.2-ee.tar.bz2) = 403107ce5f1fda0d8d14911fa48cb9da0c6e5c7b0c5ec979fc0cd54b1cd3df83 +SIZE (gitlab-v16.10.2-ee.tar.bz2) = 109168675 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; } }