Download as
Browse Code »

Commit 3e52c0994880206eb17e7c1b629bab1a2bc78cfb

Authored by Charles Oliveira
1 parent 096b98b3
Exists in branch_test and in 1 other branch 7-0-stable-spb

Added settings for relative url

Showing 3 changed files with 6 additions and 1 deletions   Show diff stats
config/software/gitlab-rails.rb
  Diff comments   View file @3e52c09
@@ -81,6 +81,10 @@ build do @@ -81,6 +81,10 @@ build do
81 # Remove directories that will be created by `gitlab-ctl reconfigure` 81 # Remove directories that will be created by `gitlab-ctl reconfigure`
82 command "rm -rf log tmp public/uploads" 82 command "rm -rf log tmp public/uploads"
83 83
  84 + # Create symbolik link for assets
  85 + command "mkdir public/gitlab"
  86 + command "ln -s ../assets/ public/gitlab"
  87 +
84 # Because db/schema.rb is modified by `rake db:migrate` after installation, 88 # Because db/schema.rb is modified by `rake db:migrate` after installation,
85 # keep a copy of schema.rb around in case we need it. (I am looking at you, 89 # keep a copy of schema.rb around in case we need it. (I am looking at you,
86 # mysql-postgresql-converter.) 90 # mysql-postgresql-converter.)
files/gitlab-cookbooks/gitlab/templates/default/gitlab.yml.erb
  Diff comments   View file @3e52c09
@@ -21,7 +21,7 @@ production: &base @@ -21,7 +21,7 @@ production: &base
21 # 2) In your gitlab.yml file: relative_url_root: /gitlab 21 # 2) In your gitlab.yml file: relative_url_root: /gitlab
22 # 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab" 22 # 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
23 # 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab" 23 # 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab"
24 - # relative_url_root: /gitlab 24 + relative_url_root: /gitlab
25 25
26 # Uncomment and customize if you can't use the default user to run GitLab (default: 'git') 26 # Uncomment and customize if you can't use the default user to run GitLab (default: 'git')
27 user: <%= node['gitlab']['user']['username'] %> 27 user: <%= node['gitlab']['user']['username'] %>
files/gitlab-cookbooks/gitlab/templates/default/unicorn.rb.erb
  Diff comments   View file @3e52c09
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 # erased! To change the contents below, edit /etc/gitlab/gitlab.rb 2 # erased! To change the contents below, edit /etc/gitlab/gitlab.rb
3 # and run `sudo gitlab-ctl reconfigure`. 3 # and run `sudo gitlab-ctl reconfigure`.
4 4
  5 +ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
5 6
6 # What ports/sockets to listen on, and what options for them. 7 # What ports/sockets to listen on, and what options for them.
7 <%- @listen.each do |port, options| %> 8 <%- @listen.each do |port, options| %>