Merge branch 'unicorn-app-dir-fix' of https://github.com/mikew/gitlabhq into mik…

…ew-unicorn-app-dir-fix Conflicts: config/unicorn.rb.example

Merge branch 'unicorn-app-dir-fix' of https://github.com/mikew/gitlabhq into mik…
…ew-unicorn-app-dir-fix Conflicts: config/unicorn.rb.example
Dmitriy Zaporozhets
2 parents 95e4217a 5e287106
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
config/unicorn.rb.example
@@ -2,7 +2,7 @@
 # note that config/gitlab.yml web path should also be changed
 # ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
  
-app_dir = "/home/git/gitlab/"
+app_dir = File.expand_path '../../', __FILE__
 worker_processes 2
 working_directory app_dir
...	...	@@ -2,7 +2,7 @@
2	2	# note that config/gitlab.yml web path should also be changed
3	3	# ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
4	4
5		-app_dir = "/home/git/gitlab/"
	5	+app_dir = File.expand_path '../../', __FILE__
6	6	worker_processes 2
7	7	working_directory app_dir
8	8
...	...