Merge branch 'sh-add-puma-ssl-support' into 'master'
Add Puma config support for SSL See merge request gitlab-org/omnibus-gitlab!6004
Showing
- files/gitlab-config-template/gitlab.rb.template 9 additions, 0 deletionsfiles/gitlab-config-template/gitlab.rb.template
- files/gitlab-cookbooks/gitlab/attributes/default.rb 8 additions, 0 deletionsfiles/gitlab-cookbooks/gitlab/attributes/default.rb
- files/gitlab-cookbooks/gitlab/libraries/puma.rb 31 additions, 2 deletionsfiles/gitlab-cookbooks/gitlab/libraries/puma.rb
- files/gitlab-cookbooks/gitlab/recipes/puma.rb 27 additions, 7 deletionsfiles/gitlab-cookbooks/gitlab/recipes/puma.rb
- files/gitlab-cookbooks/gitlab/resources/puma_config.rb 7 additions, 0 deletionsfiles/gitlab-cookbooks/gitlab/resources/puma_config.rb
- files/gitlab-cookbooks/gitlab/templates/default/puma.rb.erb 21 additions, 1 deletionfiles/gitlab-cookbooks/gitlab/templates/default/puma.rb.erb
- spec/chef/cookbooks/gitlab/recipes/puma_spec.rb 119 additions, 1 deletionspec/chef/cookbooks/gitlab/recipes/puma_spec.rb
Loading
Please register or sign in to comment