diff options
author | Marin Jankovski <marin@gitlab.com> | 2014-06-10 14:57:50 +0400 |
---|---|---|
committer | Marin Jankovski <marin@gitlab.com> | 2014-06-10 14:57:50 +0400 |
commit | fa9c39591c074d4766593f7ef93b91cbceb22c43 (patch) | |
tree | b69fc5822aaef32ad6d2c365237b300f7edbe59e /doc | |
parent | b980ab407e6194723546125c80a0911b5e557215 (diff) |
Extract gitlab-shell configuration note to gitlab-shell section.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/install/installation.md | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/doc/install/installation.md b/doc/install/installation.md index eebc1a3e32e..5ce801dc399 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -240,7 +240,12 @@ GitLab Shell is an ssh access and repository management software developed speci # Run the installation task for gitlab-shell (replace `REDIS_URL` if needed): sudo -u git -H bundle exec rake gitlab:shell:install[v1.9.5] REDIS_URL=redis://localhost:6379 RAILS_ENV=production - # By default, the gitlab-shell config is generated from your main gitlab config. You can review (and modify) it as follows: + # By default, the gitlab-shell config is generated from your main gitlab config. + # + # Note: When using GitLab with HTTPS, provide paths to the certificates under `ca_file` and `ca_path options. + # In case you are using self signed certificate set `self_signed_cert` to `true`. `gitlab_url` must point to the https host. + # + # You can review (and modify) the gitlab-shell config as follows: sudo -u git -H editor /home/git/gitlab-shell/config.yml ### Initialize Database and Activate Advanced Features @@ -341,9 +346,9 @@ Visit YOUR_SERVER in your web browser for your first GitLab login. The setup has This is a retrospective of what is needed to configure in order to use GitLab with HTTPS: 1. In `gitlab.yml` enable https by setting `https` option to `true` -1. In gitlab-shell `config.yml` provide paths to the certificates under `ca_file` and `ca_path options. -In case you are using self signed certificate set `self_signed_cert` to `true`. `gitlab_url` must point to the https host. -1. Use `gitlab-ssl` nginx config +1. In gitlab-shell `config.yml` check if certificate options `ca_file`, `ca_path options` or `self_signed_cert` are set. +`gitlab_url` must point to the https host. +1. Use the `gitlab-ssl` nginx config. ### Additional markup styles |