gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'move_config_ru_because_of_passenger' into 'master' 

Move config ru because of passenger

Passenger requires `config.ru` to be [executable](https://github.com/phusion/passenger/blob/master/doc/users_guide_snippets/troubleshooting/default.txt#L65-L78) . 

Should not influence installations without passenger.

Should fix #680 

See merge request !419
This commit is contained in:
Marin Jankovski 2015-07-28 07:53:59 +00:00
parent 441a9c1b34 bc2e6cf5f9
commit 5ee0ac2214
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/gitlab-cookbooks/gitlab/recipes/gitlab-rails.rb
View File

@ -67,7 +67,7 @@ dependent_services << "service[sidekiq]" if OmnibusHelper.should_notify?("sideki
redis_not_listening = OmnibusHelper.not_listening?("redis")
postgresql_not_listening = OmnibusHelper.not_listening?("postgresql")
template_symlink File.join(gitlab_rails_etc_dir, "config.ru") do
template_symlink File.join(gitlab_rails_dir, "config.ru") do
link_from File.join(gitlab_rails_source_dir, "config.ru")
source "gitlab-rails-config.ru.erb"
owner "root"