Download as
Browse Code »

Commit fa9c39591c074d4766593f7ef93b91cbceb22c43

Authored by Marin Jankovski
1 parent b980ab40
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Extract gitlab-shell configuration note to gitlab-shell section.

Showing 1 changed file with 9 additions and 4 deletions   Show diff stats
doc/install/installation.md
  Diff comments   View file @fa9c395
... ... @@ -240,7 +240,12 @@ GitLab Shell is an ssh access and repository management software developed speci
240 240 # Run the installation task for gitlab-shell (replace `REDIS_URL` if needed):
241 241 sudo -u git -H bundle exec rake gitlab:shell:install[v1.9.5] REDIS_URL=redis://localhost:6379 RAILS_ENV=production
242 242  
243   - # By default, the gitlab-shell config is generated from your main gitlab config. You can review (and modify) it as follows:
  243 + # By default, the gitlab-shell config is generated from your main gitlab config.
  244 + #
  245 + # Note: When using GitLab with HTTPS, provide paths to the certificates under `ca_file` and `ca_path options.
  246 + # In case you are using self signed certificate set `self_signed_cert` to `true`. `gitlab_url` must point to the https host.
  247 + #
  248 + # You can review (and modify) the gitlab-shell config as follows:
244 249 sudo -u git -H editor /home/git/gitlab-shell/config.yml
245 250  
246 251 ### 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
341 346 This is a retrospective of what is needed to configure in order to use GitLab with HTTPS:
342 347  
343 348 1. In `gitlab.yml` enable https by setting `https` option to `true`
344   -1. In gitlab-shell `config.yml` provide paths to the certificates under `ca_file` and `ca_path options.
345   -In case you are using self signed certificate set `self_signed_cert` to `true`. `gitlab_url` must point to the https host.
346   -1. Use `gitlab-ssl` nginx config
  349 +1. In gitlab-shell `config.yml` check if certificate options `ca_file`, `ca_path options` or `self_signed_cert` are set.
  350 +`gitlab_url` must point to the https host.
  351 +1. Use the `gitlab-ssl` nginx config.
347 352  
348 353 ### Additional markup styles
349 354  
... ...