mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

www/gitlab-ce: Upgrade to next major version 12.1

Browse Source 
It requires PostgreSQL version 10.7, so make sure you upgrade PostgreSQL first.
I recommand to go to version 11 as described in UPDATING entry 20190829.

MySQL support was now completely removed upstream.

Changelogs:
https://about.gitlab.com/2019/07/22/gitlab-12-1-released/
https://about.gitlab.com/2019/07/24/gitlab-12-1-1-released/
https://about.gitlab.com/2019/07/29/security-release-gitlab-12-dot-1-dot-2-released/
https://about.gitlab.com/2019/07/31/gitlab-12-1-3-released/
https://about.gitlab.com/2019/08/06/gitlab-12-1-4-released/
https://about.gitlab.com/2019/08/12/critical-security-release-gitlab-12-dot-1-dot-6-released/
https://about.gitlab.com/2019/08/29/security-release-gitlab-12-dot-2-dot-3-released/
This commit is contained in:
Matthias Fechner 2019-08-30 07:50:54 +00:00
parent 224baa63f6
commit 08a4a5d182
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=510253
10 changed files with 622 additions and 1104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
UPDATING
View File

@ -5,6 +5,17 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20190830:
AFFECTS: users of www/gitlab-ce
AUTHOR: mfechner@FreeBSD.org
Make sure you upgrade your PostgreSQL to version 11 as described in 20190829,
before you upgrade your gitlab-ce version.
Gitlab-ce 12.1 needs at least PostgreSQL version 9.6.
After this you can follow the usual upgrade guide:
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/12.0-12.1-freebsd.md
20190829:
AFFECTS: users of database/postgresql* and other software using PostgreSQL to run
AUTHOR: tz@FreeBSD.org

95
www/gitlab-ce/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gitlab-ce
PORTVERSION= 12.0.6
PORTVERSION= 12.1.8
PORTREVISION= 0
CATEGORIES= www devel
@ -14,24 +14,25 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
# the rubygems of RUN_DEPENDS matches the order of the Gemfile
# which makes maintaining this long list much easier!
# only rubygem-pg and rubygem-mysql are defined later as RUN_DEPENDS
# only rubygem-pg is defined later as RUN_DEPENDS
# for the options
MY_DEPENDS= git>=2.21.0:devel/git \
gitlab-shell>=9.3.0:devel/gitlab-shell \
gitlab-workhorse>=8.7.0:www/gitlab-workhorse \
gitaly>=1.47.2:devel/gitaly \
gitlab-pages>=1.6.2:www/gitlab-pages \
gitlab-workhorse>=8.7.1:www/gitlab-workhorse \
gitaly>=1.53.3:devel/gitaly \
gitlab-pages>=1.7.1:www/gitlab-pages \
redis>=3.2.12:databases/redis \
yarn>=1.10.0:www/yarn \
rubygem-rails5>=5.1.7:www/rubygem-rails5 \
rubygem-rails52>=5.2.3:www/rubygem-rails52 \
rubygem-nakayoshi_fork>=0.0.4:devel/rubygem-nakayoshi_fork \
rubygem-responders2-rails5>=2.0:www/rubygem-responders2-rails5 \
rubygem-responders2-rails52>=2.0:www/rubygem-responders2-rails52 \
rubygem-sprockets3>=3.7:devel/rubygem-sprockets3 \
rubygem-gitlab-default_value_for>=3.1.1:devel/rubygem-gitlab-default_value_for \
rubygem-default_value_for32>=3.2.0<3.3.0:devel/rubygem-default_value_for32 \
rubygem-pg>=1.1.0:databases/rubygem-pg \
rubygem-rugged>=0.28.0:devel/rubygem-rugged \
rubygem-grape-path-helpers>=1.1:devel/rubygem-grape-path-helpers \
rubygem-faraday>=0.12.0:www/rubygem-faraday \
rubygem-devise-rails5>=4.6:devel/rubygem-devise-rails5 \
rubygem-devise-rails52>=4.6:devel/rubygem-devise-rails52 \
rubygem-doorkeeper43>=4.3:security/rubygem-doorkeeper43 \
rubygem-doorkeeper-openid_connect>=1.5:security/rubygem-doorkeeper-openid_connect \
rubygem-omniauth>=1.8:security/rubygem-omniauth \
@ -56,7 +57,7 @@ MY_DEPENDS= git>=2.21.0:devel/git \
rubygem-jwt21>=2.1.0:www/rubygem-jwt21 \
rubygem-recaptcha>=4.11:devel/rubygem-recaptcha \
rubygem-akismet>=2.0:devel/rubygem-akismet \
rubygem-devise-two-factor30-rails5>=3.0.0:security/rubygem-devise-two-factor30-rails5 \
rubygem-devise-two-factor30-rails52>=3.0.0:security/rubygem-devise-two-factor30-rails52 \
rubygem-rqrcode-rails3>=0.1.7:www/rubygem-rqrcode-rails3 \
rubygem-attr_encrypted>=3.1.0:security/rubygem-attr_encrypted \
rubygem-u2f0>=0.2.1:net/rubygem-u2f0 \
@ -74,11 +75,11 @@ MY_DEPENDS= git>=2.21.0:devel/git \
rubygem-graphiql-rails>=1.4.10:devel/rubygem-graphiql-rails \
rubygem-apollo_upload_server>=2.0.0.b.3:net/rubygem-apollo_upload_server \
rubygem-hashie-forbidden_attributes>=0:devel/rubygem-hashie-forbidden_attributes \
rubygem-kaminari-rails5>=1.0:www/rubygem-kaminari-rails5 \
rubygem-kaminari-rails52>=1.0:www/rubygem-kaminari-rails52 \
rubygem-hamlit>=2.8.8:www/rubygem-hamlit \
rubygem-carrierwave>=1.3.0:www/rubygem-carrierwave \
rubygem-mini_magick>=0:graphics/rubygem-mini_magick \
rubygem-fog-aws>=3.3:net/rubygem-fog-aws \
rubygem-fog-aws>=3.5:net/rubygem-fog-aws \
rubygem-fog-core210>=2.1.0:devel/rubygem-fog-core210 \
rubygem-fog-google>=1.8:net/rubygem-fog-google \
rubygem-fog-local>=0.6:net/rubygem-fog-local \
@ -98,10 +99,10 @@ MY_DEPENDS= git>=2.21.0:devel/git \
rubygem-org-ruby>=0.9.12:textproc/rubygem-org-ruby \
rubygem-creole>=0.5.0:textproc/rubygem-creole \
rubygem-wikicloth081>=0.8.1:textproc/rubygem-wikicloth081 \
rubygem-asciidoctor>=1.5.8:textproc/rubygem-asciidoctor \
rubygem-asciidoctor>=2.0.10:textproc/rubygem-asciidoctor \
rubygem-asciidoctor-include-ext>=0.3.1:textproc/rubygem-asciidoctor-include-ext \
rubygem-asciidoctor-plantuml008>=0.0.8:textproc/rubygem-asciidoctor-plantuml008 \
rubygem-rouge>=3.1:textproc/rubygem-rouge \
rubygem-asciidoctor-plantuml>=0.0.9:textproc/rubygem-asciidoctor-plantuml \
rubygem-rouge>=3.5:textproc/rubygem-rouge \
rubygem-truncato>=0.7.11:textproc/rubygem-truncato \
rubygem-bootstrap_form>=4.2.0:devel/rubygem-bootstrap_form \
rubygem-nokogiri>=1.10.3:textproc/rubygem-nokogiri \
@ -129,7 +130,7 @@ MY_DEPENDS= git>=2.21.0:devel/git \
rubygem-version_sorter>=2.2.4:textproc/rubygem-version_sorter \
rubygem-js_regex>=3.1.0:textproc/rubygem-js_regex \
rubygem-device_detector>=0:devel/rubygem-device_detector \
rubygem-redis-rails-rails5>=5.0.1:www/rubygem-redis-rails-rails5 \
rubygem-redis-rails-rails52>=5.0.1:www/rubygem-redis-rails-rails52 \
rubygem-redis3>=3.2:databases/rubygem-redis3 \
rubygem-connection_pool>=2.0:net/rubygem-connection_pool \
rubygem-discordrb-webhooks-blackst0ne>=3.3.0:net-im/rubygem-discordrb-webhooks-blackst0ne \
@ -152,33 +153,35 @@ MY_DEPENDS= git>=2.21.0:devel/git \
rubygem-fast_blank>=0:devel/rubygem-fast_blank \
rubygem-chronic>=0.10.2:devel/rubygem-chronic \
rubygem-chronic_duration>=0.10.6:devel/rubygem-chronic_duration \
rubygem-webpack-rails-rails5>=0.9.10:www/rubygem-webpack-rails-rails5 \
rubygem-webpack-rails-rails52>=0.9.10:www/rubygem-webpack-rails-rails52 \
rubygem-rack-proxy>=0.6.0:www/rubygem-rack-proxy \
rubygem-sassc-rails>=2.1.0:textproc/rubygem-sassc-rails \
rubygem-uglifier27>=2.7.2:www/rubygem-uglifier27 \
rubygem-addressable25>=2.5.2:www/rubygem-addressable25 \
rubygem-font-awesome-rails-rails5>=4.7:devel/rubygem-font-awesome-rails-rails5 \
rubygem-font-awesome-rails-rails52>=4.7:devel/rubygem-font-awesome-rails-rails52 \
rubygem-gemojione>=3.3:graphics/rubygem-gemojione \
rubygem-gon-rails5>=6.2.0:www/rubygem-gon-rails5 \
rubygem-gon-rails52>=6.2.0:www/rubygem-gon-rails52 \
rubygem-request_store>=1.3:devel/rubygem-request_store \
rubygem-virtus>=1.0.1:devel/rubygem-virtus \
rubygem-base32>=0.3.0:converters/rubygem-base32 \
rubygem-sentry-raven>=2.9:devel/rubygem-sentry-raven \
rubygem-premailer-rails19-rails5>=1.9.7:mail/rubygem-premailer-rails19-rails5 \
rubygem-premailer-rails19-rails52>=1.9.7:mail/rubygem-premailer-rails19-rails52 \
rubygem-gitlab-labkit>=0.3.0:devel/rubygem-gitlab-labkit \
rubygem-ruby_parser>=3.8.4:devel/rubygem-ruby_parser \
rubygem-rails-i18n-rails5>=5.1.0:devel/rubygem-rails-i18n-rails5 \
rubygem-rails-i18n-rails52>=5.1.0:devel/rubygem-rails-i18n-rails52 \
rubygem-gettext_i18n_rails>=1.8.0:devel/rubygem-gettext_i18n_rails \
rubygem-gettext_i18n_rails_js-rails5>=1.3:devel/rubygem-gettext_i18n_rails_js-rails5 \
rubygem-gettext_i18n_rails_js-rails52>=1.3:devel/rubygem-gettext_i18n_rails_js-rails52 \
rubygem-gettext>=3.2.2:devel/rubygem-gettext \
rubygem-batch-loader>=1.4.0:devel/rubygem-batch-loader \
rubygem-peek-rails5>=1.0.1:devel/rubygem-peek-rails5 \
rubygem-peek-gc-rails5>=0.0.2:devel/rubygem-peek-gc-rails5 \
rubygem-peek-rblineprof-rails5>=0.2.0:devel/rubygem-peek-rblineprof-rails5 \
rubygem-peek-redis-rails5>=1.2.0:devel/rubygem-peek-redis-rails5 \
rubygem-peek-rails52>=1.0.1:devel/rubygem-peek-rails52 \
rubygem-peek-gc-rails52>=0.0.2:devel/rubygem-peek-gc-rails52 \
rubygem-peek-pg-rails52>=1.3.0:databases/rubygem-peek-pg-rails52 \
rubygem-peek-rblineprof-rails52>=0.2.0:devel/rubygem-peek-rblineprof-rails52 \
rubygem-peek-redis-rails52>=1.2.0:devel/rubygem-peek-redis-rails52 \
rubygem-derailed_benchmarks>0:benchmarks/rubygem-derailed_benchmarks \
rubygem-method_source>=0.8:devel/rubygem-method_source \
rubygem-influxdb>=0.2:databases/rubygem-influxdb \
rubygem-prometheus-client-mmap>=0.9.4:devel/rubygem-prometheus-client-mmap \
rubygem-prometheus-client-mmap>=0.9.8:devel/rubygem-prometheus-client-mmap \
rubygem-octokit>=4.9:net/rubygem-octokit \
rubygem-mail_room>=0.9.1:mail/rubygem-mail_room \
rubygem-email_reply_trimmer>=0.1:mail/rubygem-email_reply_trimmer \
@ -189,14 +192,14 @@ MY_DEPENDS= git>=2.21.0:devel/git \
rubygem-benchmark-memory>=0.1:benchmarks/rubygem-benchmark-memory \
rubygem-activerecord-explain-analyze>=0.1:databases/rubygem-activerecord-explain-analyze \
rubygem-oauth2>=1.4.0:net/rubygem-oauth2 \
rubygem-health_check26-rails5>=2.6.0:devel/rubygem-health_check26-rails5 \
rubygem-health_check26-rails52>=2.6.0:devel/rubygem-health_check26-rails52 \
rubygem-vmstat>=2.3.0:sysutils/rubygem-vmstat \
rubygem-sys-filesystem>=1.1.6:sysutils/rubygem-sys-filesystem \
rubygem-net-ssh>=5.0:security/rubygem-net-ssh \
rubygem-net-ssh>=5.2:security/rubygem-net-ssh \
rubygem-sshkey>=2.0:security/rubygem-sshkey \
rubygem-ed25519>=1.2:security/rubygem-ed25519 \
rubygem-bcrypt_pbkdf>=1.0:security/rubygem-bcrypt_pbkdf \
rubygem-gitaly-proto>=1.32.0:net/rubygem-gitaly-proto \
rubygem-gitaly-proto>=1.37.0:net/rubygem-gitaly-proto \
rubygem-grpc>=1.19.0:net/rubygem-grpc \
rubygem-gitaly>=0.8.0:net/rubygem-gitaly \
rubygem-google-protobuf371>=3.7.1:devel/rubygem-google-protobuf371 \
@ -204,7 +207,7 @@ MY_DEPENDS= git>=2.21.0:devel/git \
rubygem-flipper013>=0.13.0:devel/rubygem-flipper013 \
rubygem-flipper-active_record013>=0.13.0:databases/rubygem-flipper-active_record013 \
rubygem-flipper-active_support_cache_store013>=0.13.0:devel/rubygem-flipper-active_support_cache_store013 \
rubygem-lograge-rails5>=0.5:www/rubygem-lograge-rails5 \
rubygem-lograge-rails52>=0.5:www/rubygem-lograge-rails52 \
rubygem-grape_logging>=1.7:devel/rubygem-grape_logging
BUILD_DEPENDS= gem:devel/ruby-gems \
@ -218,24 +221,13 @@ CONFLICTS_INSTALL= gitolite-* \
gitea-* \
${PYTHON_PKGNAMEPREFIX}-gitosis-*
OPTIONS_SINGLE= DATABASE
OPTIONS_SINGLE_DATABASE= PGSQL MYSQL
OPTIONS_DEFAULT= PGSQL
PGSQL_DESC= Default PostgreSQL support (preferred)
MYSQL_DESC= Optional MySQL support
PGSQL_RUN_DEPENDS= rubygem-pg>=1.1.0:databases/rubygem-pg \
rubygem-peek-pg-rails5>=1.3.0:databases/rubygem-peek-pg-rails5
MYSQL_RUN_DEPENDS= rubygem-mysql2>=0.4.5:databases/rubygem-mysql2 \
rubygem-peek-mysql2-rails5>=1.2.0:databases/rubygem-peek-mysql2-rails5
USE_RUBY= yes
USE_RC_SUBR= gitlab
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags
GL_COMMIT= 914bed6c7a7182a2affcd8f399e257b950e6bace
GL_COMMIT= 99e208281768e5414e3be694023c3e776efb1e24
USERS= git
GROUPS= git
@ -245,25 +237,13 @@ NO_BUILD= yes
post-patch:
${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config/gitlab.yml.example \
${WRKSRC}/config/puma.rb.example \
${WRKSRC}/config/unicorn.rb.example \
${WRKSRC}/lib/support/nginx/gitlab \
${WRKSRC}/lib/support/nginx/gitlab-ssl
post-patch-MYSQL-on:
${CP} ${WRKSRC}/config/database.yml.mysql ${WRKSRC}/config/database.yml.sample
post-patch-MYSQL-off:
${REINPLACE_CMD} -e "/gem 'mysql2'/d" ${WRKSRC}/Gemfile
${REINPLACE_CMD} -e "/gem 'peek-mysql2'/d" ${WRKSRC}/Gemfile
post-patch-PGSQL-on:
${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample
post-patch-PGSQL-off:
${REINPLACE_CMD} -e "/gem 'pg'/d" ${WRKSRC}/Gemfile
${REINPLACE_CMD} -e "/gem 'peek-pg'/d" ${WRKSRC}/Gemfile
do-install:
${CP} ${WRKSRC}/config/database.yml.postgresql ${WRKSRC}/config/database.yml.sample
(cd ${WRKSRC} && ${RM} Gemfile.lock && bundle install --local)
${FIND} ${WRKSRC} -name '*.orig' -delete
${FIND} ${WRKSRC} -name '*.bak' -delete
@ -272,6 +252,7 @@ do-install:
${FIND} ${WRKSRC} -name "Gemfile.lock" -delete
${MV} ${WRKSRC}/config/gitlab.yml.example ${WRKSRC}/config/gitlab.yml.sample
${MV} ${WRKSRC}/config/unicorn.rb.example ${WRKSRC}/config/unicorn.rb.sample
${MV} ${WRKSRC}/config/puma.rb.example ${WRKSRC}/config/puma.rb.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/initializers/rack_attack.rb.example ${WRKSRC}/config/initializers/rack_attack.rb.sample

6
www/gitlab-ce/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1565694542
SHA256 (gitlab-org-gitlab-ce-914bed6c7a7182a2affcd8f399e257b950e6bace_GL0.tar.gz) = 47eafecc6df000820ae8f49ec1a2466901508b8cfa8fdc94db39d6fed75b624a
SIZE (gitlab-org-gitlab-ce-914bed6c7a7182a2affcd8f399e257b950e6bace_GL0.tar.gz) = 76513584
TIMESTAMP = 1567142558
SHA256 (gitlab-org-gitlab-ce-99e208281768e5414e3be694023c3e776efb1e24_GL0.tar.gz) = 5ae014172ecd2af590c2ad4943023b486c5631e5345deeec8267eccb7bcd7d50
SIZE (gitlab-org-gitlab-ce-99e208281768e5414e3be694023c3e776efb1e24_GL0.tar.gz) = 80893091

44
www/gitlab-ce/files/gitlab.in
View File

@ -48,6 +48,7 @@ load_rc_config $name
### Environment variables
RAILS_ENV="production"
EXPERIMENTAL_PUMA=""
# Script variable names should be lower-case not to conflict with
# internal /bin/sh variables such as PATH, EDITOR or SHELL.
@ -64,7 +65,7 @@ else
mail_room_enabled=false
fi
mail_room_pid_path="$pid_path/mail_room.pid"
gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse && pwd)
gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse 2> /dev/null && pwd)
gitlab_workhorse_pid_path="$pid_path/gitlab-workhorse.pid"
if checkyesno gitlab_workhorse_tcp; then
gitlab_workhorse_listen="-listenNetwork tcp -listenAddr $gitlab_workhorse_addr"
@ -150,6 +151,13 @@ if ! cd "$app_root" ; then
echo "Failed to cd into $app_root, exiting!"; exit 1
fi
# Select the web server to use
if [ -z "$EXPERIMENTAL_PUMA" ]; then
use_web_server="unicorn"
else
use_web_server="puma"
fi
### Init Script functions
@ -159,7 +167,7 @@ check_pids(){
echo "Could not create the path $pid_path needed to store the pids."
exit 1
fi
# If there exists a file which should hold the value of the Unicorn pid: read it.
# If there exists a file which should hold the value of the web server pid: read it.
if [ -f "$web_server_pid_path" ]; then
wpid=$(cat "$web_server_pid_path")
else
@ -282,7 +290,7 @@ check_stale_pids(){
# If there is a pid it is something else than 0, the service is running if
# *_status is == 0.
if [ "$wpid" != "0" ] && [ "$web_status" != "0" ]; then
echo "Removing stale Unicorn web server pid. This is most likely caused by the web server crashing the last time it ran."
echo "Removing stale web server pid. This is most likely caused by the web server crashing the last time it ran."
if ! rm "$web_server_pid_path"; then
echo "Unable to remove stale pid, exiting."
exit 1
@ -334,12 +342,12 @@ exit_if_not_running(){
fi
}
## Starts Unicorn and Sidekiq if they're not running.
## Starts web server and Sidekiq if they're not running.
start_gitlab() {
check_stale_pids
if [ "$web_status" != "0" ]; then
echo "Starting GitLab Unicorn"
echo "Starting GitLab web server ($use_web_server)"
fi
if [ "$sidekiq_status" != "0" ]; then
echo "Starting GitLab Sidekiq"
@ -359,12 +367,12 @@ start_gitlab() {
# Then check if the service is running. If it is: don't start again.
if [ "$web_status" = "0" ]; then
echo "The Unicorn web server already running with pid $wpid, not restarting."
echo "The web server already running with pid $wpid, not restarting."
else
# Remove old socket if it exists
rm -f "$socket_path"/gitlab.socket 2>/dev/null
rm -f "$rails_socket" 2>/dev/null
# Start the web server
RAILS_ENV=$RAILS_ENV bin/web start
RAILS_ENV=$RAILS_ENV USE_WEB_SERVER=$use_web_server bin/web start
fi
# If sidekiq is already running, don't start it again.
@ -420,13 +428,13 @@ start_gitlab() {
print_status
}
## Asks Unicorn, Sidekiq and MailRoom if they would be so kind as to stop, if not kills them.
## Asks web server, Sidekiq and MailRoom if they would be so kind as to stop, if not kills them.
stop_gitlab() {
exit_if_not_running
if [ "$web_status" = "0" ]; then
echo "Shutting down GitLab Unicorn"
RAILS_ENV=$RAILS_ENV bin/web stop
echo "Shutting down GitLab web server"
RAILS_ENV=$RAILS_ENV USE_WEB_SERVER=$use_web_server bin/web stop
fi
if [ "$sidekiq_status" = "0" ]; then
echo "Shutting down GitLab Sidekiq"
@ -482,9 +490,9 @@ print_status() {
return
fi
if [ "$web_status" = "0" ]; then
echo "The GitLab Unicorn web server with pid $wpid is running."
echo "The GitLab web server with pid $wpid is running."
else
printf "The GitLab Unicorn web server is \033[31mnot running\033[0m.\n"
printf "The GitLab web server is \033[31mnot running\033[0m.\n"
fi
if [ "$sidekiq_status" = "0" ]; then
echo "The GitLab Sidekiq job dispatcher with pid $spid is running."
@ -522,15 +530,15 @@ print_status() {
fi
}
## Tells unicorn to reload its config and Sidekiq to restart
## Tells web server to reload its config and Sidekiq to restart
reload_gitlab(){
exit_if_not_running
if [ "$wpid" = "0" ];then
echo "The GitLab Unicorn Web server is not running thus its configuration can't be reloaded."
echo "The GitLab web server Web server is not running thus its configuration can't be reloaded."
exit 1
fi
printf "Reloading GitLab Unicorn configuration... "
RAILS_ENV=$RAILS_ENV bin/web reload
printf "Reloading GitLab web server configuration... "
RAILS_ENV=$RAILS_ENV USE_WEB_SERVER=$use_web_server bin/web reload
echo "Done."
echo "Restarting GitLab Sidekiq since it isn't capable of reloading its config..."
@ -545,7 +553,7 @@ reload_gitlab(){
print_status
}
## Restarts Sidekiq and Unicorn.
## Restarts Sidekiq and web server.
restart_gitlab(){
check_status
if [ "$web_status" = "0" ] || [ "$sidekiq_status" = "0" ] || [ "$gitlab_workhorse" = "0" ] || { [ "$mail_room_enabled" = true ] && [ "$mail_room_status" = "0" ]; } || { [ "$gitlab_pages_enabled" = true ] && [ "$gitlab_pages_status" = "0" ]; } || { [ "$gitaly_enabled" = true ] && [ "$gitaly_status" = "0" ]; }; then

35
www/gitlab-ce/files/patch-Gemfile
View File

@ -1,26 +1,41 @@
--- Gemfile.orig 2019-07-01 15:47:59 UTC
--- Gemfile.orig 2019-08-12 15:15:49 UTC
+++ Gemfile
@@ -14,7 +14,7 @@ gem 'sprockets', '~> 3.7.0'
gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for'
@@ -14,7 +14,6 @@ gem 'sprockets', '~> 3.7.0'
gem 'default_value_for', '~> 3.2.0'
# Supported DBs
-gem 'mysql2', '~> 0.4.10', group: :mysql
+gem 'mysql2', '>= 0.4.10', group: :mysql
gem 'pg', '~> 1.1', group: :postgres
gem 'rugged', '~> 0.28'
@@ -209,7 +209,7 @@ gem 'connection_pool', '~> 2.0'
@@ -84,7 +83,6 @@ gem 'rack-cors', '~> 1.0.0', require: 'rack/cors'
gem 'graphql', '~> 1.8.0'
gem 'graphiql-rails', '~> 1.4.10'
gem 'apollo_upload_server', '~> 2.0.0.beta3'
-gem 'graphql-docs', '~> 1.6.0', group: [:development, :test]
# Disable strong_params so that Mash does not respond to :permitted?
gem 'hashie-forbidden_attributes'
@@ -210,7 +208,7 @@ gem 'connection_pool', '~> 2.0'
gem 'discordrb-webhooks-blackst0ne', '~> 3.3', require: false
# HipChat integration
-gem 'hipchat', '~> 1.5.0'
+gem 'hipchat', '~> 1.6.0'
# JIRA integration
# Jira integration
gem 'jira-ruby', '~> 1.4'
@@ -308,89 +308,6 @@ group :metrics do
@@ -296,7 +294,6 @@ gem 'batch-loader', '~> 1.4.0'
# Perf bar
gem 'peek', '~> 1.0.1'
gem 'peek-gc', '~> 0.0.2'
-gem 'peek-mysql2', '~> 1.2.0', group: :mysql
gem 'peek-pg', '~> 1.3.0', group: :postgres
gem 'peek-rblineprof', '~> 0.2.0'
gem 'peek-redis', '~> 1.2.0'
@@ -312,89 +309,6 @@ group :metrics do
# Prometheus
gem 'prometheus-client-mmap', '~> 0.9.4'
gem 'prometheus-client-mmap', '~> 0.9.8'
gem 'raindrops', '~> 0.18'
-end
-
@ -50,7 +65,7 @@
-
- gem 'database_cleaner', '~> 1.7.0'
- gem 'factory_bot_rails', '~> 4.8.2'
- gem 'rspec-rails', '~> 3.7.0'
- gem 'rspec-rails', '~> 3.8.0'
- gem 'rspec-retry', '~> 0.6.1'
- gem 'rspec_profiling', '~> 0.0.5'
- gem 'rspec-set', '~> 0.1.3'
@ -79,6 +94,7 @@
- gem 'haml_lint', '~> 0.31.0', require: false
- gem 'simplecov', '~> 0.16.1', require: false
- gem 'bundler-audit', '~> 0.5.0', require: false
- gem 'mdl', '~> 0.5.0', require: false
-
- gem 'benchmark-ips', '~> 2.3.0', require: false
-
@ -88,7 +104,6 @@
- gem 'activerecord_sane_schema_dumper', '1.0'
-
- gem 'stackprof', '~> 0.2.10', require: false
- gem 'derailed_benchmarks', require: false
-
- gem 'simple_po_parser', '~> 1.1.2', require: false
-

12
www/gitlab-ce/files/patch-config_gitlab.yml.example
View File

@ -1,6 +1,6 @@
--- config/gitlab.yml.example.orig 2019-04-19 09:51:35 UTC
--- config/gitlab.yml.example.orig 2019-07-26 17:57:42 UTC
+++ config/gitlab.yml.example
@@ -248,7 +248,7 @@ production: &base
@@ -287,7 +287,7 @@ production: &base
# external_http: ["1.1.1.1:80", "[2001::1]:80"] # If defined, enables custom domain support in GitLab Pages
# external_https: ["1.1.1.1:443", "[2001::1]:443"] # If defined, enables custom domain and certificate support in GitLab Pages
admin:
@ -9,7 +9,7 @@
## Mattermost
## For enabling Add to Mattermost button
@@ -649,7 +649,7 @@ production: &base
@@ -832,7 +832,7 @@ production: &base
# Gitaly settings
gitaly:
# Path to the directory containing Gitaly client executables.
@ -18,7 +18,7 @@
# Default Gitaly authentication token. Can be overridden per storage. Can
# be left blank when Gitaly is running locally on a Unix socket, which
# is the normal way to deploy Gitaly.
@@ -667,8 +667,8 @@ production: &base
@@ -850,8 +850,8 @@ production: &base
# real path not the symlink.
storages: # You must have at least a `default` storage path.
default:
@ -29,7 +29,7 @@
# gitaly_token: 'special token' # Optional: override global gitaly.token for this storage.
## Backup settings
@@ -700,12 +700,12 @@ production: &base
@@ -897,12 +897,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@ -45,7 +45,7 @@
# Git over HTTP
upload_pack: true
@@ -726,7 +726,7 @@ production: &base
@@ -923,7 +923,7 @@ production: &base
# CAUTION!
# Use the default values unless you really know what you are doing
git:

4
www/gitlab-ce/files/patch-config_initializers_1__settings.rb
View File

@ -1,6 +1,6 @@
--- config/initializers/1_settings.rb.orig 2019-04-19 09:51:35 UTC
--- config/initializers/1_settings.rb.orig 2019-07-26 17:57:42 UTC
+++ config/initializers/1_settings.rb
@@ -145,12 +145,8 @@ Settings.gitlab['email_subject_suffix'] ||= ENV['GITLA
@@ -174,12 +174,8 @@ Settings.gitlab['email_subject_suffix'] ||= ENV['GITLA
Settings.gitlab['base_url'] ||= Settings.__send__(:build_base_gitlab_url)
Settings.gitlab['url'] ||= Settings.__send__(:build_gitlab_url)
Settings.gitlab['user'] ||= 'git'

34
www/gitlab-ce/files/patch-config_puma.rb.example Normal file
View File

@ -0,0 +1,34 @@
--- config/puma.rb.example.orig 2019-08-17 12:35:36 UTC
+++ config/puma.rb.example
@@ -5,11 +5,11 @@
# The default is "config.ru".
#
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'
-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',
true
# Configure "min" to be the minimum number of threads to use to answer
@@ -31,12 +31,12 @@ queue_requests false
# 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'
workers 3
-require_relative "/home/git/gitlab/lib/gitlab/cluster/lifecycle_events"
-require_relative "/home/git/gitlab/lib/gitlab/cluster/puma_worker_killer_initializer"
+require_relative "%%PREFIX%%/www/gitlab-ce/lib/gitlab/cluster/lifecycle_events"
+require_relative "%%PREFIX%%/www/gitlab-ce/lib/gitlab/cluster/puma_worker_killer_initializer"
on_restart do
# Signal application hooks that we're about to restart

4
www/gitlab-ce/pkg-message
View File

@ -6,7 +6,7 @@ Gitlab was installed successfully.
You now need to set up the various components of Gitlab, so please
follow the instructions in the guide at:
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/12.0-freebsd.md
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/install/12.1-freebsd.md
EOM
type: install
}
@ -20,7 +20,7 @@ EOM
If you just installed an major upgrade of GitLab, for example you
switched from 11.8.x to 11.9.x, please follow the instructions in the guide at:
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/11.11-12.0-freebsd.md
https://gitlab.fechner.net/mfechner/Gitlab-docu/blob/master/update/12.0-12.1-freebsd.md
If you just installed an minor upgrade of GitLab please follow
the instructions in the guide at:

1481
www/gitlab-ce/pkg-plist
View File

File diff suppressed because it is too large Load Diff