Merge pull request #4902 from misilot/missing-config-unicorn.rb
Add hints for relative URL installation
This commit is contained in:
commit
6c8444f22e
|
@ -70,11 +70,11 @@ module Gitlab
|
|||
config.assets.version = '1.0'
|
||||
|
||||
# Uncomment and customize the last line to run in a non-root path
|
||||
# WARNING: This feature is no longer supported
|
||||
# WARNING: This feature is known to work, but unsupported
|
||||
# Note that three settings need to be changed for this to work.
|
||||
# 1) In your application.rb file: config.relative_url_root = "/gitlab"
|
||||
# 2) In your gitlab.yml file: relative_url_root: /gitlab
|
||||
# 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT']
|
||||
# 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
|
||||
#
|
||||
# config.relative_url_root = "/gitlab"
|
||||
end
|
||||
|
|
|
@ -20,11 +20,11 @@ production: &base
|
|||
https: false
|
||||
|
||||
# Uncomment and customize the last line to run in a non-root path
|
||||
# WARNING: This feature is no longer supported
|
||||
# WARNING: This feature is known to work, but unsupported
|
||||
# Note that three settings need to be changed for this to work.
|
||||
# 1) In your application.rb file: config.relative_url_root = "/gitlab"
|
||||
# 2) In your gitlab.yml file: relative_url_root: /gitlab
|
||||
# 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT']
|
||||
# 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
|
||||
#
|
||||
# relative_url_root: /gitlab
|
||||
|
||||
|
|
|
@ -8,6 +8,15 @@
|
|||
# See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
|
||||
# documentation.
|
||||
|
||||
# Uncomment and customize the last line to run in a non-root path
|
||||
# WARNING: This feature is known to work, but unsupported
|
||||
# Note that three settings need to be changed for this to work.
|
||||
# 1) In your application.rb file: config.relative_url_root = "/gitlab"
|
||||
# 2) In your gitlab.yml file: relative_url_root: /gitlab
|
||||
# 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
|
||||
#
|
||||
# ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
|
||||
|
||||
# Use at least one worker per core if you're on a dedicated server,
|
||||
# more will usually help for _short_ waits on databases/caches.
|
||||
worker_processes 2
|
||||
|
|
Loading…
Reference in New Issue