Skip to content

Commit b801a41

Browse files
committed
Made all suggested changes from PR review
1 parent 11d3782 commit b801a41

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

labs/lab2/nginx-plus/etc/nginx/nginx.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
user nginx;
3-
worker_processes auto;
3+
worker_processes 1;
44

55
error_log /var/log/nginx/error.log notice;
66
pid /var/run/nginx.pid;

labs/lab4/readme.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ By the end of the lab you will be able to:
2626

2727
### Create a Config Sync Group
2828

29-
Config Sync Groups allow us to group multiple NGINX instances and leverage an identical configuration across all instances. This feature is extremely helpful in ephemeral environments, such as Docker and Kubernetes, as the NGINX instance can pull its configuration versus needing to rebuild the NGINX container every time the configuration changes. This section will go through using this feature.
29+
Config Sync Groups allow you to group multiple NGINX instances and leverage an identical configuration across all instances. This feature is extremely helpful in ephemeral environments, such as Docker and Kubernetes, as the NGINX instance can pull its configuration versus needing to rebuild the NGINX container every time the configuration changes. This section will go through using this feature.
3030

3131
- Under the `Manage` heading in the left hand column, click on the `Config Sync Groups` link.<br/>
3232
![Config Sync Groups](media/lab4_csg.png)<br/><br/>
3333

3434
- In the resulting panel at the top, click on the `Add Config Sync Group` button.<br/>
3535
![Add Config Sync Group](media/lab4_csg_add.png)<br/><br/>
3636

37-
- A modal window will pop up and ask you to give a name for the Config Sync Group. Here we will use the name: `one-workshop-plus`<br/>
37+
- A modal window will pop up and ask you to give a name for the Config Sync Group. Here you will use the name: `one-workshop-plus`<br/>
3838
![Config Sync Group Name](media/lab4_csg_name.png)<br/><br/>
3939

4040
Click the create button. Your newly created Config Sync Group `one-workshop-plus` should be in the list.
@@ -133,9 +133,9 @@ You can see that the container starts up. With a refresh on the Config Sync Grou
133133

134134
<br/>
135135

136-
You can also notice that it says we are out of sync! We did not populate the configuration manually, so the first container added will download the configuration and become the new default config. We will change this a bit later. Hey, didn't we use docker compose to start our containers in the previous labs? We can add those instances to this `Config Sync Group` even easier than what we did above - automatically!
136+
You can also notice that it says you are out of sync! You did not populate the configuration manually, so the first container added will download the configuration and become the new default config. You will change this a bit later. Hey, didn't you use docker compose to start our containers in the previous labs? We can add those instances to this `Config Sync Group` even easier than what you did above - automatically!
137137

138-
Let's stop our running containers by running:
138+
Let's stop your running containers by running:
139139

140140
```bash
141141
cd ../lab2
@@ -162,7 +162,7 @@ Use the refresh button and you should see the three new instances added to our c
162162

163163
<br/>
164164

165-
Upon being added to the Config Instance group, NGINX One will attempt to apply the configuration of the group to the instances in it. Here we can see the config was immediately applied to **one-plus-2** and **one-plus-3**. **one-plus-1** is the synch still in progress instance here. This shows it takes a a moment as the Config Sync Group applies the configuration to each new instance. We will need to refresh the UI to make sure the configs all get applied, but give it a minute.
165+
Upon being added to the Config Instance group, NGINX One will attempt to apply the configuration of the group to the instances in it. Here you can see the config was immediately applied to **one-plus-2** and **one-plus-3**. **one-plus-1** is the synch still in progress instance here. This shows it takes a moment as the Config Sync Group applies the configuration to each new instance. You will need to refresh the UI to make sure the configs all get applied, but give it a minute.
166166

167167
<br/>
168168

@@ -172,16 +172,16 @@ Upon being added to the Config Instance group, NGINX One will attempt to apply t
172172

173173
### Option 2 - Let's manually change the config file and apply it to the group
174174

175-
Let's show we can push a change to the whole group! Click on the `Configuration` button next to the `Details`.
175+
Let's show you can push a change to the whole group! Click on the `Configuration` button next to the `Details`.
176176

177-
1. When you select the _Configuration_ tab, notice the configuration here is identical to the first NGINX instance you just added. We could have pre-populated this area before any instances were added and the first instance would have pulled the config instead of pushing it's config as in the previous example. Now click the `Edit Configuration` button on the right hand side of the page:
177+
1. When you select the _Configuration_ tab, notice the configuration here is identical to the first NGINX instance you just added. You could have pre-populated this area before any instances were added and the first instance would have pulled the config instead of pushing it's config as in the previous example. Now click the `Edit Configuration` button on the right hand side of the page:
178178
<br/>
179179

180180
![Edit Config](media/lab4_csg_edit_config.png)
181181

182182
<br/>
183183

184-
We are going to add to the contents (which were pulled from the first added instance) of the default config that will be used going forward. Click on and modify the /etc/nginx/conf.d/default.conf file. We are going to add this snippet at lines 21-25
184+
You are going to add to the contents (which were pulled from the first added instance) of the default config that will be used going forward. Click on and modify the /etc/nginx/conf.d/default.conf file. You are going to add this snippet at lines 21-25
185185

186186
```nginx
187187
location /test_header {
@@ -205,7 +205,7 @@ What would it look like if there was a problem when ONE Console checked the conf
205205

206206
<br/>
207207

208-
Ok, we don't have any errors, so click on the green **Next** button. The following screen allows you to see a diff between the two configs. After reviewing you can click `Save and Publish`.
208+
Ok, you don't have any errors, so click on the green **Next** button. The following screen allows you to see a diff between the two configs. After reviewing you can click `Save and Publish`.
209209

210210
<br>
211211

@@ -221,7 +221,7 @@ NGINX One will indicate the change was a success and push it to all of our insta
221221

222222
<br>
223223

224-
We can now see all the instances are in sync!
224+
You can now see all the instances are in sync!
225225

226226
<br>
227227

0 commit comments

Comments
 (0)