File tree Expand file tree Collapse file tree 4 files changed +9
-0
lines changed
files/gitlab-cookbooks/gitlab/templates/default
spec/chef/cookbooks/gitlab/recipes Expand file tree Collapse file tree 4 files changed +9
-0
lines changed Original file line number Diff line number Diff line change @@ -5,12 +5,14 @@ exec 2>&1
5
5
6
6
< %= render(" make_metrics_rundir.erb" ) %>
7
7
< %= render(" mount_point_check.erb" ) %>
8
+ rubyopt=" -W:no-experimental"
8
9
9
10
exec chpst -P \
10
11
-u < %= @options[:user] %> :< %= @options[:groupname] %> \
11
12
-U < %= @options[:user] %> :< %= @options[:groupname] %> \
12
13
-e /opt/gitlab/etc/gitlab-rails/env \
13
14
/usr/bin/env \
15
+ RUBYOPT=" ${rubyopt} " \
14
16
prometheus_multiproc_dir=" ${prometheus_run_dir} " \
15
17
ACTION_CABLE_WORKER_POOL_SIZE=< %= @options[:actioncable_worker_pool_size] %> \
16
18
/opt/gitlab/embedded/bin/bundle exec puma -C < %= @options[:puma_rb] %>
Original file line number Diff line number Diff line change @@ -5,10 +5,13 @@ cd <%= node['gitlab']['gitlab_rails']['dir'] %>/working
5
5
exec 2>&1
6
6
< %= render(" make_metrics_rundir.erb" , cookbook: ' gitlab' ) %>
7
7
< %= render(" mount_point_check.erb" , cookbook: ' gitlab' ) %>
8
+ rubyopt=" -W:no-experimental"
9
+
8
10
exec chpst -e /opt/gitlab/etc/gitlab-rails/env -P \
9
11
-U < %= @options[:user] %> :< %= @options[:groupname] %> \
10
12
-u < %= @options[:user] %> :< %= @options[:groupname] %> \
11
13
/usr/bin/env \
14
+ RUBYOPT=" ${rubyopt} " \
12
15
prometheus_multiproc_dir=" ${prometheus_run_dir} " \
13
16
/opt/gitlab/embedded/service/gitlab-rails/bin/sidekiq-cluster \
14
17
-e < %= node[' gitlab' ][' gitlab_rails' ][' environment' ] %> \
Original file line number Diff line number Diff line change 60
60
expect ( content ) . to match ( /chmod 0700 \/ run\/ gitlab\/ puma/ )
61
61
expect ( content ) . to match ( /chown git \/ run\/ gitlab\/ puma/ )
62
62
expect ( content ) . to match ( /export prometheus_run_dir=\' \/ run\/ gitlab\/ puma\' / )
63
+ expect ( content ) . to match ( /rubyopt=\" -W:no-experimental\" / )
64
+ expect ( content ) . to include ( %(RUBYOPT="${rubyopt}") )
63
65
expect ( content ) . to match ( %r(/opt/gitlab/embedded/bin/bundle exec puma -C /var/opt/gitlab/gitlab-rails/etc/puma.rb) )
64
66
}
65
67
end
Original file line number Diff line number Diff line change 23
23
expect ( content ) . to match ( /chmod 0700 \/ run\/ gitlab\/ sidekiq/ )
24
24
expect ( content ) . to match ( /chown git \/ run\/ gitlab\/ sidekiq/ )
25
25
expect ( content ) . to match ( /export prometheus_run_dir=\' \/ run\/ gitlab\/ sidekiq\' / )
26
+ expect ( content ) . to match ( /rubyopt=\" -W:no-experimental\" / )
27
+ expect ( content ) . to include ( %(RUBYOPT="${rubyopt}") )
26
28
expect ( content ) . to match ( %r{bin/sidekiq-cluster} )
27
29
expect ( content ) . to match ( /-m 20/ ) # max_concurrency
28
30
expect ( content ) . to match ( /--timeout 25/ ) # shutdown timeout
You can’t perform that action at this time.
0 commit comments