summaryrefslogtreecommitdiff
path: root/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-23 09:06:22 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-23 09:06:22 +0000
commit1d89871c573830a8194110af252e8907177184b3 (patch)
tree9aece724c48fc633f38c3b8cbaf2f71fcf4c3f4c /doc/ci/examples/laravel_with_gitlab_and_envoy/index.md
parent89861e72b7375353654513aa2bc0a3b60a5e4377 (diff)
downloadgitlab-ce-1d89871c573830a8194110af252e8907177184b3.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci/examples/laravel_with_gitlab_and_envoy/index.md')
-rw-r--r--doc/ci/examples/laravel_with_gitlab_and_envoy/index.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md b/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md
index d79821ff258..ae17e9bf549 100644
--- a/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md
+++ b/doc/ci/examples/laravel_with_gitlab_and_envoy/index.md
@@ -82,7 +82,7 @@ git push -u origin master
## Configure the production server
Before we begin setting up Envoy and GitLab CI/CD, let's quickly make sure the production server is ready for deployment.
-We have installed LEMP stack which stands for Linux, Nginx, MySQL and PHP on our Ubuntu 16.04.
+We have installed LEMP stack which stands for Linux, NGINX, MySQL and PHP on our Ubuntu 16.04.
### Create a new user
@@ -151,11 +151,11 @@ git clone git@gitlab.example.com:<USERNAME>/laravel-sample.git
Answer **yes** if asked `Are you sure you want to continue connecting (yes/no)?`.
It adds GitLab.com to the known hosts.
-### Configuring Nginx
+### Configuring NGINX
Now, let's make sure our web server configuration points to the `current/public` rather than `public`.
-Open the default Nginx server block configuration file by typing:
+Open the default NGINX server block configuration file by typing:
```bash
sudo nano /etc/nginx/sites-available/default