From 06903b0396572ce0971a9fa5ad0bd2d0c9bf3715 Mon Sep 17 00:00:00 2001 From: Thomas Misilo Date: Fri, 27 Sep 2013 08:39:38 -0400 Subject: Added reference to the line "ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"" , as it talked about in the gitlab.yml.example --- config/unicorn.rb.example | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example index 5c933df073a..502727fdfe4 100644 --- a/config/unicorn.rb.example +++ b/config/unicorn.rb.example @@ -8,6 +8,9 @@ # See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete # documentation. +# Uncomment and customize the next line to run in a non-root path +# 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 -- cgit v1.2.1 From b688bac9b6ca02571ed9fb3149e5b3bb6052c9fb Mon Sep 17 00:00:00 2001 From: Thomas Misilo Date: Sat, 28 Sep 2013 07:40:48 -0400 Subject: Updated at the request of @f0k --- config/unicorn.rb.example | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example index 502727fdfe4..e4e13426831 100644 --- a/config/unicorn.rb.example +++ b/config/unicorn.rb.example @@ -8,7 +8,13 @@ # See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete # documentation. -# Uncomment and customize the next line to run in a non-root path +# 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, -- cgit v1.2.1 From e99701fbfa6d5a2d4abd9cc1321a3575c86c85ea Mon Sep 17 00:00:00 2001 From: Thomas Misilo Date: Sun, 29 Sep 2013 13:46:02 -0400 Subject: Changed wording in application.rb and gitlab.yml.example to match unicorn.rb. This is for when using a non-root path --- config/application.rb | 4 ++-- config/gitlab.yml.example | 4 ++-- 2 files changed, 4 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 -- cgit v1.2.1