diff options
| -rw-r--r-- | config/application.rb | 4 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | config/unicorn.rb.example | 9 |
3 files changed, 13 insertions, 4 deletions
diff --git a/config/application.rb b/config/application.rb index 8ac07ef337a..f483ccdad17 100644 --- a/config/application.rb +++ b/config/application.rb @@ -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 diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index c1cc9f872f3..8ece14526b3 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -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 diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example index 5c933df073a..e4e13426831 100644 --- a/config/unicorn.rb.example +++ b/config/unicorn.rb.example @@ -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 |