summaryrefslogtreecommitdiff
path: root/doc/user/project/pages/custom_domains_ssl_tls_certification/index.md
diff options
context:
space:
mode:
authorVladimir Shushlin <vshushlin@gitlab.com>2019-07-17 13:00:46 +0000
committerNick Thomas <nick@gitlab.com>2019-07-17 13:00:46 +0000
commitdb782d184010b14858e3de8400531f841ee474e7 (patch)
tree1f846c7470b868701fcc4066e9c19c18dccd3609 /doc/user/project/pages/custom_domains_ssl_tls_certification/index.md
parent371f9cc60379343503cdf90c206c6209fb3a7b47 (diff)
downloadgitlab-ce-db782d184010b14858e3de8400531f841ee474e7.tar.gz
Add docs for Let's Encrypt integration
* Add deprecation warning to old integration * Add user docs * Add admin docs
Diffstat (limited to 'doc/user/project/pages/custom_domains_ssl_tls_certification/index.md')
-rw-r--r--doc/user/project/pages/custom_domains_ssl_tls_certification/index.md11
1 files changed, 10 insertions, 1 deletions
diff --git a/doc/user/project/pages/custom_domains_ssl_tls_certification/index.md b/doc/user/project/pages/custom_domains_ssl_tls_certification/index.md
index 219e141d72e..54ecc42d2b9 100644
--- a/doc/user/project/pages/custom_domains_ssl_tls_certification/index.md
+++ b/doc/user/project/pages/custom_domains_ssl_tls_certification/index.md
@@ -204,6 +204,14 @@ can use the following setup:
Read this document for an [overview on SSL/TLS certification](ssl_tls_concepts.md).
+To secure your custom domain with GitLab Pages you can opt by:
+
+- Using the [Let's Encrypt integration with GitLab Pages](lets_encrypt_integration.md),
+ which automatically obtains and renews SSL certificates
+ for your Pages domains.
+- Manually adding SSL/TLS certificates to GitLab Pages websites
+ by following the steps below.
+
### Requirements
- A GitLab Pages website up and running accessible via a custom domain.
@@ -255,6 +263,7 @@ To enable this setting:
1. Navigate to your project's **Settings > Pages**.
1. Tick the checkbox **Force HTTPS (requires valid certificates)**.
+
<!-- ## Troubleshooting
Include any troubleshooting steps that you can foresee. If you know beforehand what issues
@@ -265,4 +274,4 @@ questions that you know someone might ask.
Each scenario can be a third-level heading, e.g. `### Getting error message X`.
If you have none to add when creating a doc, leave this section in place
-but commented out to help encourage others to add to it in the future. --> \ No newline at end of file
+but commented out to help encourage others to add to it in the future. -->