Download as
Browse Code »

Commit 6c8444f22e43de2f0166a6d7f98c7d9404d90ba2

Authored by Jacob Vosmaer
2 parents 4deb4575 e99701fb
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #4902 from misilot/missing-config-unicorn.rb 

Add hints for relative URL installation
Showing 3 changed files with 13 additions and 4 deletions   Show diff stats
config/application.rb
  Diff comments   View file @6c8444f
@@ -70,11 +70,11 @@ module Gitlab @@ -70,11 +70,11 @@ module Gitlab
70 config.assets.version = '1.0' 70 config.assets.version = '1.0'
71 71
72 # Uncomment and customize the last line to run in a non-root path 72 # Uncomment and customize the last line to run in a non-root path
73 - # WARNING: This feature is no longer supported 73 + # WARNING: This feature is known to work, but unsupported
74 # Note that three settings need to be changed for this to work. 74 # Note that three settings need to be changed for this to work.
75 # 1) In your application.rb file: config.relative_url_root = "/gitlab" 75 # 1) In your application.rb file: config.relative_url_root = "/gitlab"
76 # 2) In your gitlab.yml file: relative_url_root: /gitlab 76 # 2) In your gitlab.yml file: relative_url_root: /gitlab
77 - # 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] 77 + # 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
78 # 78 #
79 # config.relative_url_root = "/gitlab" 79 # config.relative_url_root = "/gitlab"
80 end 80 end
config/gitlab.yml.example
  Diff comments   View file @6c8444f
@@ -20,11 +20,11 @@ production: &base @@ -20,11 +20,11 @@ production: &base
20 https: false 20 https: false
21 21
22 # Uncomment and customize the last line to run in a non-root path 22 # Uncomment and customize the last line to run in a non-root path
23 - # WARNING: This feature is no longer supported 23 + # WARNING: This feature is known to work, but unsupported
24 # Note that three settings need to be changed for this to work. 24 # Note that three settings need to be changed for this to work.
25 # 1) In your application.rb file: config.relative_url_root = "/gitlab" 25 # 1) In your application.rb file: config.relative_url_root = "/gitlab"
26 # 2) In your gitlab.yml file: relative_url_root: /gitlab 26 # 2) In your gitlab.yml file: relative_url_root: /gitlab
27 - # 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] 27 + # 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
28 # 28 #
29 # relative_url_root: /gitlab 29 # relative_url_root: /gitlab
30 30
config/unicorn.rb.example
  Diff comments   View file @6c8444f
@@ -8,6 +8,15 @@ @@ -8,6 +8,15 @@
8 # See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete 8 # See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
9 # documentation. 9 # documentation.
10 10
  11 +# Uncomment and customize the last line to run in a non-root path
  12 +# WARNING: This feature is known to work, but unsupported
  13 +# Note that three settings need to be changed for this to work.
  14 +# 1) In your application.rb file: config.relative_url_root = "/gitlab"
  15 +# 2) In your gitlab.yml file: relative_url_root: /gitlab
  16 +# 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
  17 +#
  18 +# ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
  19 +
11 # Use at least one worker per core if you're on a dedicated server, 20 # Use at least one worker per core if you're on a dedicated server,
12 # more will usually help for _short_ waits on databases/caches. 21 # more will usually help for _short_ waits on databases/caches.
13 worker_processes 2 22 worker_processes 2