Skip to content
Snippets Groups Projects
Commit 7a60c5a2 authored by Jouke Witteveen's avatar Jouke Witteveen
Browse files

Expose ssh_user as a distinct configuration option

parent 22674593
No related branches found
No related tags found
No related merge requests found
---
title: Expose ssh_user as a distinct configuration option
merge_request: 3925
author:
type: added
......@@ -60,6 +60,7 @@
##! Docs: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/settings/gitlab.yml.md
################################################################################
# gitlab_rails['gitlab_ssh_host'] = 'ssh.host_example.com'
# gitlab_rails['gitlab_ssh_user'] = ''
# gitlab_rails['time_zone'] = 'UTC'
### Request duration
......
......@@ -88,6 +88,7 @@
default['gitlab']['gitlab-rails']['gitlab_host'] = node['fqdn']
default['gitlab']['gitlab-rails']['gitlab_port'] = 80
default['gitlab']['gitlab-rails']['gitlab_https'] = false
default['gitlab']['gitlab-rails']['gitlab_ssh_user'] = nil
default['gitlab']['gitlab-rails']['gitlab_ssh_host'] = nil
default['gitlab']['gitlab-rails']['time_zone'] = nil
default['gitlab']['gitlab-rails']['gitlab_email_from'] = nil
......
......@@ -23,6 +23,10 @@
# Otherwise, ssh host will be set to the `host:` value above
ssh_host: <%= @gitlab_ssh_host %>
# If your ssh user differs from the system user, you need to specify it here
# Set it to an empty string to omit the username from any ssh url altogether
ssh_user: <%= quote(@gitlab_ssh_user) %>
# WARNING: See config/application.rb under "Relative url support" for the list of
# other files that need to be changed for relative url support
relative_url_root: <%= @gitlab_relative_url %>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment