Download as
Browse Code »

Commit c0f6a932b9277a49232348029198f3094276a84b

Authored by Sytse Sijbrandij
2 parents 96e21134 906c65b6
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #5548 from CromFr/master 

Fixed comments for running gitlab in a non-root path
Showing 3 changed files with 10 additions and 4 deletions   Show diff stats
config/application.rb
  Diff comments   View file @c0f6a93
@@ -71,10 +71,12 @@ module Gitlab @@ -71,10 +71,12 @@ module Gitlab
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: We recommend creating a FQDN to host GitLab in a root path instead of this. 73 # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this.
74 - # Note that three settings need to be changed for this to work. 74 + # Note that four 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'] = "/gitlab" 77 # 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
  78 + # 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab"
  79 + # To update the path, run: sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
78 # 80 #
79 # config.relative_url_root = "/gitlab" 81 # config.relative_url_root = "/gitlab"
80 82
config/gitlab.yml.example
  Diff comments   View file @c0f6a93
@@ -20,11 +20,13 @@ production: &base @@ -20,11 +20,13 @@ 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: We recommend creating a FQDN to host GitLab in a root path instead of this.  
24 - # Note that three settings need to be changed for this to work. 23 + # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this.
  24 + # Note that four 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'] = "/gitlab" 27 # 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
  28 + # 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab"
  29 + # To update the path, run: sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
28 # 30 #
29 # relative_url_root: /gitlab 31 # relative_url_root: /gitlab
30 32
config/unicorn.rb.example
  Diff comments   View file @c0f6a93
@@ -10,10 +10,12 @@ @@ -10,10 +10,12 @@
10 10
11 # Uncomment and customize the last line to run in a non-root path 11 # Uncomment and customize the last line to run in a non-root path
12 # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this. 12 # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this.
13 -# Note that three settings need to be changed for this to work. 13 +# Note that four settings need to be changed for this to work.
14 # 1) In your application.rb file: config.relative_url_root = "/gitlab" 14 # 1) In your application.rb file: config.relative_url_root = "/gitlab"
15 # 2) In your gitlab.yml file: 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" 16 # 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
  17 +# 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab"
  18 +# To update the path, run: sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
17 # 19 #
18 # ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab" 20 # ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
19 21