Skip to content

Commit acec07d

Browse files
committed
edits
1 parent 1f7e5fa commit acec07d

File tree

10 files changed

+36
-36
lines changed

10 files changed

+36
-36
lines changed

content/nginx/deployment-guides/amazon-web-services/route-53-global-server-load-balancing.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ We create health checks both for each NGINX Plus load balancer individually and
186186

187187
<img src="https://cdn-1.wp.nginx.com/wp-content/uploads/2016/10/aws-route53-get-notified-health-check.png" alt="Screenshot of Route 53 configuration screen for enabling notifications of failed health checks, during configuration of Route 53 global load balancing (GLB) with NGINX Plus" style="border:2px solid #666666; padding:2px; margin:2px;" />
188188

189-
4. Repeat Steps 2 and 3 for your other NGINX Plus load balancers (in this guide, {{<nb>}}**US West LB 2**,{{</nb>}} {{<nb>}}**US East LB 1**,{{</nb>}} and {{<nb>}}**US East LB 2**){{</nb>}}.
189+
4. Repeat Steps 2 and 3 for your other NGINX Plus load balancers (in this guide, {{<nb>}}**US West LB 2**{{</nb>}}, {{<nb>}}**US East LB 1**{{</nb>}}, and {{<nb>}}**US East LB 2**){{</nb>}}.
190190

191191
5. Proceed to the next section to configure health checks for the load balancer pairs.
192192

@@ -282,9 +282,9 @@ These instructions assume that you have configured NGINX Plus on two EC2 instan
282282
nginx -s reload
283283
```
284284

285-
5. Repeat Steps 1 through 4 for the other three load balancers {{<nb>}}(**US West LB 2**,{{</nb>}} {{<nb>}}**US East LB 1**,{{</nb>}} and {{<nb>}}**US East LB2**){{</nb>}}.
285+
5. Repeat Steps 1 through 4 for the other three load balancers {{<nb>}}(**US West LB 2**{{</nb>}}, {{<nb>}}**US East LB 1**{{</nb>}}, and {{<nb>}}**US East LB2**){{</nb>}}.
286286

287-
In Step 3, change the filename as appropriate {{<nb>}}(**west-lb2.conf**,{{</nb>}} {{<nb>}}**east-lb1.conf**,{{</nb>}} and {{<nb>}}**east-lb2.conf**){{</nb>}}. In the {{<nb>}}**east-lb1.conf**{{</nb>}} and {{<nb>}}**east-lb2.conf**{{</nb>}} files, the `server` directives specify the public DNS names of Backup 3 and Backup 4.
287+
In Step 3, change the filename as appropriate {{<nb>}}(**west-lb2.conf**{{</nb>}}, {{<nb>}}**east-lb1.conf**{{</nb>}}, and {{<nb>}}**east-lb2.conf**){{</nb>}}. In the {{<nb>}}**east-lb1.conf**{{</nb>}} and {{<nb>}}**east-lb2.conf**{{</nb>}} files, the `server` directives specify the public DNS names of Backup 3 and Backup 4.
288288

289289
<span id="appendix"></span>
290290
## Appendix
@@ -366,7 +366,7 @@ After you complete the instructions on all instances, the list for a region (her
366366
<span id="configure-backend-servers"></span>
367367
### Configuring NGINX Open Source on the Backend Servers
368368

369-
Perform these steps on all four backend servers: {{<nb>}}**Backend 1**,{{</nb>}} {{<nb>}}**Backend 2**,{{</nb>}} {{<nb>}}**Backend 3**,{{</nb>}} and {{<nb>}}**Backend 4**{{</nb>}}. In Step 3, substitute the appropriate name for `Backend X` in the **index.html** file.
369+
Perform these steps on all four backend servers: {{<nb>}}**Backend 1**{{</nb>}}, {{<nb>}}**Backend 2**{{</nb>}}, {{<nb>}}**Backend 3**{{</nb>}}, and {{<nb>}}**Backend 4**{{</nb>}}. In Step 3, substitute the appropriate name for `Backend X` in the **index.html** file.
370370

371371
**Note:** Some commands require `root` privilege. If appropriate for your environment, prefix commands with the `sudo` command.
372372

@@ -421,7 +421,7 @@ Perform these steps on all four backend servers: {{<nb>}}**Backend 1**,{{</nb>}}
421421
<span id="configure-load-balancers"></span>
422422
### Configuring NGINX Plus on the Load Balancers
423423

424-
Perform these steps on all four backend servers: {{<nb>}}**US West LB 1**,{{</nb>}} {{<nb>}}**US West LB 2**,{{</nb>}} {{<nb>}}**US East LB 1**,{{</nb>}} and {{<nb>}}**US West LB 2**{{</nb>}}.
424+
Perform these steps on all four backend servers: {{<nb>}}**US West LB 1**{{</nb>}}, {{<nb>}}**US West LB 2**{{</nb>}}, {{<nb>}}**US East LB 1**{{</nb>}}, and {{<nb>}}**US West LB 2**{{</nb>}}.
425425

426426
**Note:** Some commands require `root` privilege. If appropriate for your environment, prefix commands with the `sudo` command.
427427

content/nginx/deployment-guides/google-cloud-platform/high-availability-all-active.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ Create three source VM instances based on a GCE VM image. We're basing our insta
205205

206206
Install and configure PHP and FastCGI on the instances.
207207

208-
<span style="text-decoration: underline; white-space: nowrap;">Repeat these instructions</span> for all three source instances {{<nb>}}(**nginx-plus-app-1**,{{</nb>}} {{<nb>}}**nginx-plus-app-2**,{{</nb>}} and {{<nb>}}**nginx-plus-lb**){{</nb>}}.
208+
<span style="text-decoration: underline; white-space: nowrap;">Repeat these instructions</span> for all three source instances {{<nb>}}(**nginx-plus-app-1**{{</nb>}}, {{<nb>}}**nginx-plus-app-2**{{</nb>}}, and {{<nb>}}**nginx-plus-lb**){{</nb>}}.
209209

210210
**Note:** Some commands require `root` privilege. If appropriate for your environment, prefix commands with the `sudo` command.
211211

@@ -253,7 +253,7 @@ Now install NGINX Plus and download files that are specific to the all‑active
253253

254254
Both the configuration and content files are available at the [NGINX GitHub repository](https://github.com/nginxinc/NGINX-Demos/tree/master/gce-nginx-plus-deployment-guide-files).
255255

256-
<span style="text-decoration: underline; white-space: nowrap;">Repeat these instructions</span> for all three source instances {{<nb>}}(**nginx-plus-app-1**,{{</nb>}} {{<nb>}}**nginx-plus-app-2**,{{</nb>}} and {{<nb>}}**nginx-plus-lb**){{</nb>}}.
256+
<span style="text-decoration: underline; white-space: nowrap;">Repeat these instructions</span> for all three source instances {{<nb>}}(**nginx-plus-app-1**{{</nb>}}, {{<nb>}}**nginx-plus-app-2**{{</nb>}}, and {{<nb>}}**nginx-plus-lb**){{</nb>}}.
257257

258258
**Note:** Some commands require `root` privilege. If appropriate for your environment, prefix commands with the `sudo` command.
259259

@@ -265,7 +265,7 @@ Both the configuration and content files are available at the [NGINX GitHub repo
265265

266266
4. Copy the right configuration file from the **etc\_nginx\_conf.d** subdirectory of the cloned repository to **/etc/nginx/conf.d**:
267267

268-
- On <span style="text-decoration: underline;">both</span> {{<nb>}}**nginx-plus-app-1**{{</nb>}} and {{<nb>}}**nginx-plus-app-2**,{{</nb>}} copy {{<nb>}}**gce-all-active-app.conf**{{</nb>}}.
268+
- On <span style="text-decoration: underline;">both</span> {{<nb>}}**nginx-plus-app-1**{{</nb>}} and {{<nb>}}**nginx-plus-app-2**{{</nb>}}, copy {{<nb>}}**gce-all-active-app.conf**{{</nb>}}.
269269

270270
You can also run the following commands to download the configuration file directly from the GitHub repository:
271271

@@ -281,7 +281,7 @@ Both the configuration and content files are available at the [NGINX GitHub repo
281281
wget https://github.com/nginxinc/NGINX-Demos/blob/master/gce-nginx-plus-deployment-guide-files/etc_nginx_conf.d/gce-all-active-app.conf
282282
```
283283
284-
- On {{<nb>}}**nginx-plus-lb**,{{</nb>}} copy {{<nb>}}**gce-all-active-lb.conf**{{</nb>}}.
284+
- On {{<nb>}}**nginx-plus-lb**{{</nb>}}, copy {{<nb>}}**gce-all-active-lb.conf**{{</nb>}}.
285285
286286
You can also run the following commands to download the configuration file directly from the GitHub repository:
287287
@@ -297,7 +297,7 @@ Both the configuration and content files are available at the [NGINX GitHub repo
297297
wget https://github.com/nginxinc/NGINX-Demos/blob/master/gce-nginx-plus-deployment-guide-files/etc_nginx_conf.d/gce-all-active-lb.conf
298298
```
299299
300-
5. On the LB instance {{<nb>}}(**nginx-plus-lb**),{{</nb>}} use a text editor to open {{<nb>}}**gce-all-active-lb.conf**{{</nb>}}. Change the `server` directives in the `upstream` block to reference the internal IP addresses of the {{<nb>}}**nginx-plus-app-1**{{</nb>}} and {{<nb>}}**nginx-plus-app-2**{{</nb>}} instances (substitute the address for the expression in angle brackets). You do not need to modify the two application instances.
300+
5. On the LB instance {{<nb>}}(**nginx-plus-lb**){{</nb>}}, use a text editor to open {{<nb>}}**gce-all-active-lb.conf**{{</nb>}}. Change the `server` directives in the `upstream` block to reference the internal IP addresses of the {{<nb>}}**nginx-plus-app-1**{{</nb>}} and {{<nb>}}**nginx-plus-app-2**{{</nb>}} instances (substitute the address for the expression in angle brackets). You do not need to modify the two application instances.
301301
302302
You can look up internal IP addresses in the {{<nb>}}**Internal IP**{{</nb>}} column of the table on the {{<nb>}}**Compute Engine > VM instances**{{</nb>}} summary page.
303303
@@ -400,7 +400,7 @@ Create three source instances based on a prebuilt NGINX Plus image running on <
400400

401401
9. Modify or verify the indicated editable fields (non‑editable fields are not listed):
402402

403-
- **Tags** – If a default tag appears (for example, {{<nb>}}**nginx-plus-app-1-tcp-80**),{{</nb>}} click the **X** after its name to remove it. Then, type in {{<nb>}}**nginx-plus-http-fw-rule**{{</nb>}}.
403+
- **Tags** – If a default tag appears (for example, {{<nb>}}**nginx-plus-app-1-tcp-80**){{</nb>}}, click the **X** after its name to remove it. Then, type in {{<nb>}}**nginx-plus-http-fw-rule**{{</nb>}}.
404404
- {{<nb>}}**External IP**{{</nb>}} – **Ephemeral** (the default)
405405
- {{<nb>}}**Boot disk and local disks**{{</nb>}} – Uncheck the checkbox labeled **Delete boot disk when instance is deleted**.
406406
- {{<nb>}}**Additional disks**{{</nb>}} – No changes
@@ -435,7 +435,7 @@ Create the second application instance by cloning the first one.
435435
436436
- **Name** – {{<nb>}}**nginx-plus-app-2-vm**{{</nb>}}. Here we're adding the {{<nb>}}**-vm**{{</nb>}} suffix to make the name consistent with the first instance; GCE does not add it automatically when you clone an instance.
437437
- **Zone** – The GCP zone that makes sense for your location. We're using {{<nb>}}**us-west1-a**{{</nb>}}.
438-
- {{<nb>}}**Machine type**{{</nb>}} – The appropriate size for the level of traffic you anticipate. We're selecting {{<nb>}}**f1-micro**,{{</nb>}} which is ideal for testing purposes.
438+
- {{<nb>}}**Machine type**{{</nb>}} – The appropriate size for the level of traffic you anticipate. We're selecting {{<nb>}}**f1-micro**{{</nb>}}, which is ideal for testing purposes.
439439
- {{<nb>}}**Boot disk type**{{</nb>}} – {{<nb>}}**New 10 GB standard persistent disk**{{</nb>}} (the value inherited from {{<nb>}}**nginx-plus-app-1-vm**){{</nb>}}
440440
- {{<nb>}}**Identity and API access**{{</nb>}} – Set the {{<nb>}}**Access scopes**{{</nb>}} radio button to {{<nb>}}**Allow default access**{{</nb>}} and accept the default values in all other fields. If you want more granular control over access than is provided by these settings, modify the fields in this section as appropriate.
441441
- **Firewall** – Verify that neither check box is checked (the default).
@@ -461,7 +461,7 @@ Repeat Steps 2 through 7 of <a href="#source-prebuilt-app-2">Creating the Seco
461461

462462
Install and configure PHP and FastCGI on the instances.
463463

464-
<span style="text-decoration: underline; white-space: nowrap;">Repeat these instructions</span> for all three source instances {{<nb>}}(**nginx-plus-app-1-vm**,{{</nb>}} {{<nb>}}**nginx-plus-app-2-vm**,{{</nb>}} and {{<nb>}}**nginx-plus-lb-vm**){{</nb>}}.
464+
<span style="text-decoration: underline; white-space: nowrap;">Repeat these instructions</span> for all three source instances {{<nb>}}(**nginx-plus-app-1-vm**{{</nb>}}, {{<nb>}}**nginx-plus-app-2-vm**{{</nb>}}, and {{<nb>}}**nginx-plus-lb-vm**){{</nb>}}.
465465

466466
**Note:** Some commands require `root` privilege. If appropriate for your environment, prefix commands with the `sudo` command.
467467

@@ -511,7 +511,7 @@ Now download files that are specific to the all‑active deployment:
511511

512512
Both the configuration and content files are available at the [NGINX GitHub repository](https://github.com/nginxinc/NGINX-Demos/tree/master/gce-nginx-plus-deployment-guide-files).
513513

514-
<span style="text-decoration: underline; white-space: nowrap;">Repeat these instructions</span> for all three source instances {{<nb>}}(**nginx-plus-app-1-vm**,{{</nb>}} {{<nb>}}**nginx-plus-app-2-vm**,{{</nb>}} and {{<nb>}}**nginx-plus-lb-vm**){{</nb>}}.
514+
<span style="text-decoration: underline; white-space: nowrap;">Repeat these instructions</span> for all three source instances {{<nb>}}(**nginx-plus-app-1-vm**{{</nb>}}, {{<nb>}}**nginx-plus-app-2-vm**{{</nb>}}, and {{<nb>}}**nginx-plus-lb-vm**){{</nb>}}.
515515

516516
**Note:** Some commands require `root` privilege. If appropriate for your environment, prefix commands with the `sudo` command.
517517

@@ -522,7 +522,7 @@ Both the configuration and content files are available at the [NGINX GitHub repo
522522

523523
3. Copy the right configuration file from the **etc\_nginx\_conf.d** subdirectory of the cloned repository to **/etc/nginx/conf.d**:
524524

525-
- On <span style="text-decoration: underline;">both</span> {{<nb>}}**nginx-plus-app-1-vm**{{</nb>}} and {{<nb>}}**nginx-plus-app-2-vm**,{{</nb>}} copy {{<nb>}}**gce-all-active-app.conf**{{</nb>}}.
525+
- On <span style="text-decoration: underline;">both</span> {{<nb>}}**nginx-plus-app-1-vm**{{</nb>}} and {{<nb>}}**nginx-plus-app-2-vm**{{</nb>}}, copy {{<nb>}}**gce-all-active-app.conf**{{</nb>}}.
526526

527527
You can also run these commands to download the configuration file from GitHub:
528528

@@ -538,7 +538,7 @@ Both the configuration and content files are available at the [NGINX GitHub repo
538538
wget https://github.com/nginxinc/NGINX-Demos/blob/master/gce-nginx-plus-deployment-guide-files/etc_nginx_conf.d/gce-all-active-app.conf
539539
```
540540

541-
- On {{<nb>}}**nginx-plus-lb-vm**,{{</nb>}} copy {{<nb>}}**gce-all-active-lb.conf**{{</nb>}}.
541+
- On {{<nb>}}**nginx-plus-lb-vm**{{</nb>}}, copy {{<nb>}}**gce-all-active-lb.conf**{{</nb>}}.
542542

543543
You can also run the following commands to download the configuration file directly from the GitHub repository:
544544

@@ -554,7 +554,7 @@ Both the configuration and content files are available at the [NGINX GitHub repo
554554
wget https://github.com/nginxinc/NGINX-Demos/blob/master/gce-nginx-plus-deployment-guide-files/etc_nginx_conf.d/gce-all-active-lb.conf
555555
```
556556

557-
4. On the LB instance {{<nb>}}(**nginx-plus-lb-vm**),{{</nb>}} use a text editor to open {{<nb>}}**gce-all-active-lb.conf**{{</nb>}}. Change the `server` directives in the `upstream` block to reference the internal IP addresses of the {{<nb>}}**nginx-plus-app-1-vm**{{</nb>}} and {{<nb>}}**nginx-plus-app-2-vm**{{</nb>}} instances. (No action is required on the two application instances themselves.)
557+
4. On the LB instance {{<nb>}}(**nginx-plus-lb-vm**){{</nb>}}, use a text editor to open {{<nb>}}**gce-all-active-lb.conf**{{</nb>}}. Change the `server` directives in the `upstream` block to reference the internal IP addresses of the {{<nb>}}**nginx-plus-app-1-vm**{{</nb>}} and {{<nb>}}**nginx-plus-app-2-vm**{{</nb>}} instances. (No action is required on the two application instances themselves.)
558558

559559
You can look up internal IP addresses in the {{<nb>}}**Internal IP**{{</nb>}} column of the table on the {{<nb>}}**Compute Engine > VM instances**{{</nb>}} summary page.
560560

@@ -623,8 +623,8 @@ Create _gold images_, which are base images that GCE clones automatically when i
623623

624624
3. In the table, select all three instances:
625625

626-
- If you created source instances from [VM (Ubuntu) images](#source-vm): {{<nb>}}**nginx-plus-app-1**,{{</nb>}} {{<nb>}}**nginx-plus-app-2**,{{</nb>}} and {{<nb>}}**nginx-plus-lb**{{</nb>}}
627-
- If you created source instances from [prebuilt NGINX Plus images](#source-prebuilt): {{<nb>}}**nginx-plus-app-1-vm**,{{</nb>}} {{<nb>}}**nginx-plus-app-2-vm**,{{</nb>}} and {{<nb>}}**nginx-plus-lb-vm**{{</nb>}}
626+
- If you created source instances from [VM (Ubuntu) images](#source-vm): {{<nb>}}**nginx-plus-app-1**{{</nb>}}, {{<nb>}}**nginx-plus-app-2**{{</nb>}}, and {{<nb>}}**nginx-plus-lb**{{</nb>}}
627+
- If you created source instances from [prebuilt NGINX Plus images](#source-prebuilt): {{<nb>}}**nginx-plus-app-1-vm**{{</nb>}}, {{<nb>}}**nginx-plus-app-2-vm**{{</nb>}}, and {{<nb>}}**nginx-plus-lb-vm**{{</nb>}}
628628

629629
4. Click <span style="color:#3366cc;">STOP</span> in the top toolbar to stop the instances.
630630

@@ -654,21 +654,21 @@ Create _gold images_, which are base images that GCE clones automatically when i
654654
- **Description** – **NGINX Plus Application 1 Gold Image**
655655
- **Encryption** – {{<nb>}}**Automatic (recommended)**{{</nb>}} (the default)
656656
- **Source** – **Disk** (the default)
657-
- {{<nb>}}**Source disk**{{</nb>}} – {{<nb>}}**nginx-plus-app-1**{{</nb>}} or {{<nb>}}**nginx-plus-app-1-vm**,{{</nb>}} depending on the method you used to create source instances (select the source instance from the drop‑down menu)
657+
- {{<nb>}}**Source disk**{{</nb>}} – {{<nb>}}**nginx-plus-app-1**{{</nb>}} or {{<nb>}}**nginx-plus-app-1-vm**{{</nb>}}, depending on the method you used to create source instances (select the source instance from the drop‑down menu)
658658

659659
9. Click the <span style="background-color:#3366cc; color:white;"> Create </span> button.
660660

661661
10. Repeat Steps 7 through 9 to create a second image with the following values (retain the default values in all other fields):
662662

663663
- **Name** – {{<nb>}}**nginx-plus-app-2-image**{{</nb>}}
664664
- **Description** – **NGINX {{<nb>}}Plus Application 2 Gold Image**{{</nb>}}
665-
- {{<nb>}}**Source disk**{{</nb>}} – {{<nb>}}**nginx-plus-app-2**{{</nb>}} or {{<nb>}}**nginx-plus-app-2-vm**,{{</nb>}} depending on the method you used to create source instances (select the source instance from the drop‑down menu)
665+
- {{<nb>}}**Source disk**{{</nb>}} – {{<nb>}}**nginx-plus-app-2**{{</nb>}} or {{<nb>}}**nginx-plus-app-2-vm**{{</nb>}}, depending on the method you used to create source instances (select the source instance from the drop‑down menu)
666666

667667
11. Repeat Steps 7 through 9 to create a third image with the following values (retain the default values in all other fields):
668668

669669
- **Name** – {{<nb>}}**nginx-plus-lb-image**{{</nb>}}
670670
- **Description** – **NGINX Plus LB Gold Image**
671-
- {{<nb>}}**Source disk**{{</nb>}} – {{<nb>}}**nginx-plus-lb**{{</nb>}} or {{<nb>}}**nginx-plus-lb-vm**,{{</nb>}} depending on the method you used to create source instances (select the source instance from the drop‑down menu)
671+
- {{<nb>}}**Source disk**{{</nb>}} – {{<nb>}}**nginx-plus-lb**{{</nb>}} or {{<nb>}}**nginx-plus-lb-vm**{{</nb>}}, depending on the method you used to create source instances (select the source instance from the drop‑down menu)
672672

673673
12. Verify that the three images appear at the top of the table on the {{<nb>}}**Compute Engine > Images**{{</nb>}} tab.
674674

content/nginx/deployment-guides/load-balance-third-party/apache-tomcat.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ http {
171171
}
172172
```
173173

174-
You can also use wildcard notation to reference all files that pertain to a certain function or traffic type in the appropriate context block. For example, if you name all HTTP configuration files {{<nb>}}**_function_-http.conf**,{{</nb>}} this is an appropriate `include` directive:
174+
You can also use wildcard notation to reference all files that pertain to a certain function or traffic type in the appropriate context block. For example, if you name all HTTP configuration files {{<nb>}}**_function_-http.conf**{{</nb>}}, this is an appropriate `include` directive:
175175

176176
```nginx
177177
http {
@@ -294,7 +294,7 @@ To configure load balancing, first create a named _upstream group_, which lists
294294

295295
2. In the `server` block for HTTPS traffic that we created in [Configuring Virtual Servers for HTTP and HTTPS Traffic](#virtual-servers), include two `location` blocks:
296296

297-
- The first one matches HTTPS requests in which the path starts with {{<nb>}}**/tomcat-app/**,{{</nb>}} and proxies them to the **tomcat** upstream group we created in the previous step.
297+
- The first one matches HTTPS requests in which the path starts with {{<nb>}}**/tomcat-app/**{{</nb>}}, and proxies them to the **tomcat** upstream group we created in the previous step.
298298

299299
- The second one funnels all traffic to the first `location` block, by doing a temporary redirect of all requests for **"http://example.com/"**.
300300

@@ -409,7 +409,7 @@ To enable basic caching in <span style="white-space: nowrap;">NGINX Open Source<
409409

410410
Directive documentation: [proxy_cache_path](https://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_cache_path)
411411

412-
2. In the `location` block that matches HTTPS requests in which the path starts with {{<nb>}}**/tomcat-app/**,{{</nb>}} include the `proxy_cache` directive to reference the cache created in the previous step.
412+
2. In the `location` block that matches HTTPS requests in which the path starts with {{<nb>}}**/tomcat-app/**{{</nb>}}, include the `proxy_cache` directive to reference the cache created in the previous step.
413413

414414
```nginx
415415
# In the 'server' block for HTTPS traffic

0 commit comments

Comments
 (0)