Commit b980ab407e6194723546125c80a0911b5e557215
1 parent
f055bad5
Exists in
spb-stable
and in
2 other branches
Update installation doc to mention using https.
Showing
1 changed file
with
12 additions
and
1 deletions
Show diff stats
doc/install/installation.md
@@ -158,6 +158,8 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da | @@ -158,6 +158,8 @@ We recommend using a PostgreSQL database. For MySQL check [MySQL setup guide](da | ||
158 | # Make sure to change "localhost" to the fully-qualified domain name of your | 158 | # Make sure to change "localhost" to the fully-qualified domain name of your |
159 | # host serving GitLab where necessary | 159 | # host serving GitLab where necessary |
160 | # | 160 | # |
161 | + # If you want to use https make sure that you set `https` to `true`. See #using-https for more details. | ||
162 | + # | ||
161 | # If you installed Git from source, change the git bin_path to /usr/local/bin/git | 163 | # If you installed Git from source, change the git bin_path to /usr/local/bin/git |
162 | sudo -u git -H editor config/gitlab.yml | 164 | sudo -u git -H editor config/gitlab.yml |
163 | 165 | ||
@@ -305,7 +307,7 @@ Make sure to edit the config file to match your setup: | @@ -305,7 +307,7 @@ Make sure to edit the config file to match your setup: | ||
305 | # domain name of your host serving GitLab. | 307 | # domain name of your host serving GitLab. |
306 | sudo editor /etc/nginx/sites-available/gitlab | 308 | sudo editor /etc/nginx/sites-available/gitlab |
307 | 309 | ||
308 | -**Note:** If you want to use https, replace the `gitlab` nginx config with `gitlab-ssl`. | 310 | +**Note:** If you want to use https, replace the `gitlab` nginx config with `gitlab-ssl`. See #using-https for more details. |
309 | 311 | ||
310 | ### Restart | 312 | ### Restart |
311 | 313 | ||
@@ -334,6 +336,15 @@ Visit YOUR_SERVER in your web browser for your first GitLab login. The setup has | @@ -334,6 +336,15 @@ Visit YOUR_SERVER in your web browser for your first GitLab login. The setup has | ||
334 | 336 | ||
335 | ## Advanced Setup Tips | 337 | ## Advanced Setup Tips |
336 | 338 | ||
339 | +### Using HTTPS | ||
340 | + | ||
341 | +This is a retrospective of what is needed to configure in order to use GitLab with HTTPS: | ||
342 | + | ||
343 | +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 | ||
347 | + | ||
337 | ### Additional markup styles | 348 | ### Additional markup styles |
338 | 349 | ||
339 | Apart from the always supported markdown style there are other rich text files that GitLab can display. But you might have to install a dependency to do so. Please see the [github-markup gem readme](https://github.com/gitlabhq/markup#markups) for more information. For example, reStructuredText markup language support requires python-docutils: | 350 | Apart from the always supported markdown style there are other rich text files that GitLab can display. But you might have to install a dependency to do so. Please see the [github-markup gem readme](https://github.com/gitlabhq/markup#markups) for more information. For example, reStructuredText markup language support requires python-docutils: |