diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-02-22 01:28:28 +0200 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-01-31 22:55:29 +0000 |
| commit | 228455af6baefff6bea679c30216d6ede703b2de (patch) | |
| tree | 7f80930b462c6bb6ea1b3f4afbeba21e8b337365 /doc/pages/administration.md | |
| parent | d24763fa16874cf8f99a32635787134f4f76d699 (diff) | |
| download | gitlab-ce-228455af6baefff6bea679c30216d6ede703b2de.tar.gz | |
Rename NGINX section
Diffstat (limited to 'doc/pages/administration.md')
| -rw-r--r-- | doc/pages/administration.md | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/doc/pages/administration.md b/doc/pages/administration.md index 5d7c0d76620..675a41d8023 100644 --- a/doc/pages/administration.md +++ b/doc/pages/administration.md @@ -33,7 +33,7 @@ probably want to read the [user documentation](README.md). - [Custom domains without HTTPS support](#custom-domains-without-https-support) - [Wildcard HTTP domain without custom domains](#wildcard-http-domain-without-custom-domains) - [Wildcard HTTPS domain without custom domains](#wildcard-https-domain-without-custom-domains) -- [NGINX caveats](#nginx-caveats) +- [NGINX configuration](#nginx-configuration) - [Set maximum pages size](#set-maximum-pages-size) - [Change storage path](#change-storage-path) - [Backup](#backup) @@ -206,7 +206,7 @@ Below are the four scenarios that are described in sudo ln -sf /etc/nginx/sites-{available,enabled}/gitlab-pages-ssl.conf ``` - Make sure to [properly edit the config](#nginx-caveats) to add your domain + Make sure to [properly edit the config](#nginx-configuration) to add your domain as well as correctly point to the right location of the SSL certificate files. Restart Nginx for the changes to take effect. @@ -249,14 +249,14 @@ Below are the four scenarios that are described in gitlab_pages_options="-pages-domain example.io -pages-root $app_root/shared/pages -listen-proxy 127.0.0.1:8090 -listen-http 1.1.1.1:80" ``` -1. Copy the `gitlab-pages-ssl` Nginx configuration file: +1. Copy the `gitlab-pages` Nginx configuration file: ```bash - sudo cp lib/support/nginx/gitlab-pages-ssl /etc/nginx/sites-available/gitlab-pages-ssl.conf - sudo ln -sf /etc/nginx/sites-{available,enabled}/gitlab-pages-ssl.conf + sudo cp lib/support/nginx/gitlab-pages-ssl /etc/nginx/sites-available/gitlab-pages.conf + sudo ln -sf /etc/nginx/sites-{available,enabled}/gitlab-pages.conf ``` - Make sure to [properly edit the config](#nginx-caveats) to add your domain. + Make sure to [properly edit the config](#nginx-configuration) to add your domain. Restart Nginx for the changes to take effect. 1. [Restart GitLab][restart] @@ -298,7 +298,7 @@ Below are the four scenarios that are described in sudo ln -sf /etc/nginx/sites-{available,enabled}/gitlab-pages.conf ``` - Make sure to [properly edit the config](#nginx-caveats) to add your domain. + Make sure to [properly edit the config](#nginx-configuration) to add your domain. Restart Nginx for the changes to take effect. 1. [Restart GitLab][restart] @@ -340,7 +340,7 @@ Below are the four scenarios that are described in sudo ln -sf /etc/nginx/sites-{available,enabled}/gitlab-pages-ssl.conf ``` - Make sure to [properly edit the config](#nginx-caveats) to add your domain + Make sure to [properly edit the config](#nginx-configuration) to add your domain as well as correctly point to the right location of the SSL certificate files. Restart Nginx for the changes to take effect. @@ -364,7 +364,7 @@ Below are the four scenarios that are described in 1. [Reconfigure GitLab][reconfigure] -## NGINX caveats +## NGINX configuration Be extra careful when setting up the domain name in the NGINX config. You must not remove the backslashes. |