Skip to content

Commit

Permalink
prepare for gitlab 16.6
Browse files Browse the repository at this point in the history
  • Loading branch information
alexandermeindl committed Nov 16, 2023
1 parent a31b7a0 commit 4000229
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion roles/gitlab/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ gitlab_with_zsh: true
gitlab_omniauth_enabled: false
gitlab_omniauth_providers: []

gitlab_repository_version: '16-5-stable'
gitlab_repository_version: '16-6-stable'
gitlab_ce_version: '{{ gitlab_repository_version }}'
gitlab_ee_version: '{{ gitlab_repository_version }}-ee'
gitlab_path: "{{ gitlab_home }}/gitlab"
Expand Down
2 changes: 1 addition & 1 deletion roles/gitlab/templates/gitlab/gitlab.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ production: &base
## Git settings
# CAUTION!
# Use the default values unless you really know what you are doing
ansible.builtin.git:
git:
bin_path: {{ gitlab_git_bin }}

## Webpack settings
Expand Down
11 changes: 5 additions & 6 deletions roles/gitlab/templates/gitlab/puma.rb.j2
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,10 @@ log_formatter do |str|
json_formatter.call(str)
end

lowlevel_error_handler do |ex, env|
if Raven.configuration.capture_allowed?
Raven.capture_exception(ex, tags: { 'handler': 'puma_low_level' }, extra: { puma_env: env })
end
require_relative "/home/git/gitlab/lib/gitlab/puma/error_handler"

# note the below is just a Rack response
[500, {}, ["An error has occurred and reported in the system's low-level error handler."]]
error_handler = Gitlab::Puma::ErrorHandler.new(ENV['RAILS_ENV'] == 'production')

lowlevel_error_handler do |ex, env, status_code|
error_handler.execute(ex, env, status_code)
end
5 changes: 5 additions & 0 deletions roles/gitlab/templates/gitlab/resque.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ production:
# please read here for more information: https://docs.gitlab.com/ee/administration/redis/index.html
##
# url: redis://master:6379
# ssl_params:
# ca_path: "/path/to/dir/with/certs"
# ca_file: "/path/to/ca.crt"
# cert_file: "/path/to/client.crt"
# key_file: "/path/to/client.key"
# sentinels:
# -
# host: replica1
Expand Down

0 comments on commit 4000229

Please sign in to comment.