diff options
| -rw-r--r-- | config/application.rb | 4 | ||||
| -rw-r--r-- | config/gitlab.yml.example | 4 | ||||
| -rw-r--r-- | config/unicorn.rb.example | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb index d85bcab7885..d06d47c773a 100644 --- a/config/application.rb +++ b/config/application.rb @@ -71,10 +71,12 @@ module Gitlab # 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. + # Note that four 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" + # 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab" + # To update the path, run: sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production # # config.relative_url_root = "/gitlab" diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 163af226aaa..bea0b71fc1b 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -21,10 +21,12 @@ production: &base # 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. + # Note that four 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" + # 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab" + # To update the path, run: sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production # # relative_url_root: /gitlab diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example index e4e13426831..911c93b53f4 100644 --- a/config/unicorn.rb.example +++ b/config/unicorn.rb.example @@ -10,10 +10,12 @@ # 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. +# Note that four 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" +# 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab" +# To update the path, run: sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production # # ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab" |