Add ability to set different ssh host, if different from http/https
This commit is contained in:
parent
9b7dd8b4c0
commit
db86fe47ce
|
@ -19,6 +19,11 @@ production: &base
|
|||
port: 80
|
||||
https: false
|
||||
|
||||
# Uncommment this line below if your ssh host is different from HTTP/HTTPS one
|
||||
# (you'd obviously need to replace ssh.host_example.com with your own host).
|
||||
# Otherwise, ssh host will be set to the `host:` value above
|
||||
# ssh_host: ssh.host_example.com
|
||||
|
||||
# Uncomment and customize the last line to run in a non-root path
|
||||
# WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this.
|
||||
# Note that four settings need to be changed for this to work.
|
||||
|
|
|
@ -117,7 +117,7 @@ Settings.gitlab_shell['hooks_path'] ||= Settings.gitlab['user_home'] + '/gitla
|
|||
Settings.gitlab_shell['receive_pack'] = true if Settings.gitlab_shell['receive_pack'].nil?
|
||||
Settings.gitlab_shell['upload_pack'] = true if Settings.gitlab_shell['upload_pack'].nil?
|
||||
Settings.gitlab_shell['repos_path'] ||= Settings.gitlab['user_home'] + '/repositories/'
|
||||
Settings.gitlab_shell['ssh_host'] ||= (Settings.gitlab.host || 'localhost')
|
||||
Settings.gitlab_shell['ssh_host'] ||= (Settings.gitlab.ssh_host || Settings.gitlab.host || 'localhost')
|
||||
Settings.gitlab_shell['ssh_port'] ||= 22
|
||||
Settings.gitlab_shell['ssh_user'] ||= Settings.gitlab.user
|
||||
Settings.gitlab_shell['owner_group'] ||= Settings.gitlab.user
|
||||
|
|
Loading…
Reference in New Issue