added RAILS_RELATIVE_URL_ROOT support
This commit is contained in:
parent
e9394c48ca
commit
21e55ca318
7 changed files with 16 additions and 7 deletions
|
@ -18,6 +18,9 @@ gitlab:
|
|||
host: localhost
|
||||
port: 80
|
||||
https: false
|
||||
# uncomment and customize to run in non-root path
|
||||
# note that ENV['RAILS_RELATIVE_URL_ROOT'] in config/unicorn.rb may need to be changed
|
||||
# relative_url_root: /gitlab
|
||||
|
||||
## Email settings
|
||||
# Email address used in the "From" field in mails sent by GitLab
|
||||
|
|
|
@ -25,7 +25,8 @@ class Settings < Settingslogic
|
|||
[ gitlab.protocol,
|
||||
"://",
|
||||
gitlab.host,
|
||||
custom_port
|
||||
custom_port,
|
||||
gitlab.relative_url_root
|
||||
].join('')
|
||||
end
|
||||
end
|
||||
|
@ -45,6 +46,7 @@ Settings.gitlab['default_projects_limit'] ||= 10
|
|||
Settings.gitlab['host'] ||= 'localhost'
|
||||
Settings.gitlab['https'] ||= false
|
||||
Settings.gitlab['port'] ||= Settings.gitlab.https ? 443 : 80
|
||||
Settings.gitlab['relative_url_root'] ||= ''
|
||||
Settings.gitlab['protocol'] ||= Settings.gitlab.https ? "https" : "http"
|
||||
Settings.gitlab['email_from'] ||= "gitlab@#{Settings.gitlab.host}"
|
||||
Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url)
|
||||
|
|
|
@ -18,7 +18,7 @@ Gitlab::Application.routes.draw do
|
|||
project_root: Gitlab.config.gitolite.repos_path,
|
||||
upload_pack: Gitlab.config.gitolite.upload_pack,
|
||||
receive_pack: Gitlab.config.gitolite.receive_pack
|
||||
}), at: '/:path', constraints: { path: /[-\/\w\.-]+\.git/ }
|
||||
}), at: '/', constraints: lambda { |request| /[-\/\w\.-]+\.git/.match(request.path_info) }
|
||||
|
||||
#
|
||||
# Help
|
||||
|
|
|
@ -1,3 +1,7 @@
|
|||
# uncomment and customize to run in non-root path
|
||||
# note that config/gitlab.yml web path should also be changed
|
||||
# ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
|
||||
|
||||
app_dir = "/home/gitlab/gitlab/"
|
||||
worker_processes 2
|
||||
working_directory app_dir
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue