Verified Commit cfbe6c55 authored by Tomasz Maczukin's avatar Tomasz Maczukin
Browse files

Remove config.ru template

parent 8f6f66a7

config/software/gitlab-rails.rb

+0 −3
Original line number Diff line number Diff line
@@ -75,9 +75,6 @@ build do 
  delete 'config/database.yml'

  delete 'config/secrets.yml'



  # Remove so we can place our template

  delete 'config.ru'



  # Remove auto-generated files

  delete '.secret'

  delete '.gitlab_shell_secret'

files/gitlab-config-template/gitlab.rb.template

+2 −2
Original line number Diff line number Diff line
@@ -360,8 +360,8 @@ external_url 'GENERATED_EXTERNAL_URL' 
## Only change these settings if you understand well what they mean

## see https://about.gitlab.com/2015/06/05/how-gitlab-uses-unicorn-and-unicorn-worker-killer/

## and https://github.com/kzk/unicorn-worker-killer

# unicorn['worker_memory_limit_min'] = "300*(1024**2)"

# unicorn['worker_memory_limit_max'] = "350*(1024**2)"

# unicorn['worker_memory_limit_min'] = "300 * 1 << 20"

# unicorn['worker_memory_limit_max'] = "350 * 1 << 20"





##################

files/gitlab-cookbooks/gitlab/attributes/default.rb

+2 −2
Original line number Diff line number Diff line
@@ -258,8 +258,8 @@ default['gitlab']['unicorn']['tcp_nopush'] = true 
default['gitlab']['unicorn']['backlog_socket'] = 1024

default['gitlab']['unicorn']['somaxconn'] = 1024

default['gitlab']['unicorn']['worker_timeout'] = 60

default['gitlab']['unicorn']['worker_memory_limit_min'] = "300*(1024**2)"

default['gitlab']['unicorn']['worker_memory_limit_max'] = "350*(1024**2)"

default['gitlab']['unicorn']['worker_memory_limit_min'] = "300 * 1 << 20"

default['gitlab']['unicorn']['worker_memory_limit_max'] = "350 * 1 << 20"



####

# Sidekiq

files/gitlab-cookbooks/gitlab/definitions/unicorn_config.rb

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
# limitations under the License.

#



define :unicorn_config, :listen => nil, :working_directory => nil, :worker_timeout => 60, :preload_app => false, :worker_processes => 4, :before_fork => nil, :after_fork => nil, :pid => nil, :stderr_path => nil, :stdout_path => nil, :relative_url => nil, :notifies => nil, :owner => nil, :group => nil, :mode => nil do

define :unicorn_config, :listen => nil, :working_directory => nil, :worker_timeout => 60, :worker_memory_limit_min => nil, :worker_memory_limit_max => nil, :preload_app => false, :worker_processes => 4, :before_fork => nil, :after_fork => nil, :pid => nil, :stderr_path => nil, :stdout_path => nil, :relative_url => nil, :notifies => nil, :owner => nil, :group => nil, :mode => nil do

  config_dir = File.dirname(params[:name])



  directory config_dir do

files/gitlab-cookbooks/gitlab/definitions/unicorn_service.rb

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ define :unicorn_service, :rails_app => nil, :user => nil do 
      }

    )

    worker_timeout node['gitlab'][svc]['worker_timeout']

    worker_memory_limit_min node['gitlab'][svc]['worker_memory_limit_min']

    worker_memory_limit_max node['gitlab'][svc]['worker_memory_limit_max']

    working_directory unicorn_working_dir

    worker_processes node['gitlab'][svc]['worker_processes']

    preload_app true