summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2016-11-15 07:48:41 +0000
committerSean McGivern <sean@mcgivern.me.uk>2016-11-15 07:48:41 +0000
commit1dcd521edb3d179f04b6c366507544607a7eb9de (patch)
treefe9d7d0a61375e7bfc086f269c0e4a6fd1e0182a
parent64d094eecc7ac9617156438150d233f595451f71 (diff)
parentb105d9da75d9e5131f2c118bc87f67df108d1214 (diff)
downloadgitlab-ce-1dcd521edb3d179f04b6c366507544607a7eb9de.tar.gz
Merge branch 'patch-9' into 'master'
clarify best way to install custom CA See merge request !7434
-rw-r--r--doc/integration/README.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/integration/README.md b/doc/integration/README.md
index 77bea3d2ceb..ae4387e2577 100644
--- a/doc/integration/README.md
+++ b/doc/integration/README.md
@@ -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