Merge branch 'patch-9' into 'master'

clarify best way to install custom CA

See merge request !7434
This commit is contained in:
Sean McGivern 2016-11-15 07:48:41 +00:00
commit 1dcd521edb
1 changed files with 5 additions and 1 deletions

View File

@ -48,7 +48,11 @@ at Super User also has relevant information.
**Omnibus Trusted Chain**
It is enough to concatenate the certificate to the main trusted certificate:
[Install the self signed certificate or custom certificate authorities](http://docs.gitlab.com/omnibus/common_installation_problems/README.html#using-self-signed-certificate-or-custom-certificate-authorities)
in to GitLab Omnibus.
It is enough to concatenate the certificate to the main trusted certificate
however it may be overwritten during upgrades:
```bash
cat jira.pem >> /opt/gitlab/embedded/ssl/certs/cacert.pem