snese · egor-miasnikov · Jan 31, 2023 · Jan 31, 2023 · Jan 31, 2023 · Jan 31, 2023
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 public/
+.idea
 npm-debug.log
 node_modules
 public

diff --git a/content/Lab1/Step1/_index.en.md b/content/Lab1/Step1/_index.en.md
@@ -10,7 +10,7 @@ weight: 30
 * Click **Next**
 
 ![](/images/lab1-0.png)
-
+![](/images/lab1-1.png)
 * For **Stack name**, enter `vpc-stack`.
 * For **Number of Availability Zones** select **2**.
 * For **Availability Zones**, choose **us-east-1a** and **us-east-1b**. 

diff --git a/content/Lab1/Step4/_index.en.md b/content/Lab1/Step4/_index.en.md
@@ -17,6 +17,9 @@ In this section, we will modify the Security Groups of the EC2 instance and MySQ
 * Click **Add rule**.
 * For **Type**, select **HTTP**.
 * For **Source**, select **db-sg** in the drow-down field.
+* Click **Add rule**.
+* For **Type**, select **HTTP**.
+* For **Source**, select **0.0.0.0** in the drow-down field.
 * Click **Save rules**.
 
 ![](/images/lab1-14.png)

diff --git a/content/Lab1/Step6/_index.en.md b/content/Lab1/Step6/_index.en.md
@@ -15,12 +15,18 @@ First of all, we'll create a new user in AWS that the Wordpress plugin will use
 ![](/images/lab1-16.png)
 
 * For **User name**, enter `Wordpress`.
-* In the section **Select AWS access type**, select **Access key - Programmatic access**.
-* Click **Next: Permissions**.
-* Select the **Attach existing policies directly** box on top of the next page.
+* Click **Next**.
+* Select the **Attach policies directly** box on top of the next page.
 * Search for `CloudFrontFullAccess` and select it. 
 * Do the same for `AmazonS3FullAccess`.
-* Click **Next: Tags** → **Next: Review** → **Create user** .
+* Click **Next** → **Create user**.
+* Go into created user.
+* Click **Security credentials** tab.
+* Go to the **Access keys** section.
+* Click **Create access key**.
+* Select **Application running on an AWS compute service**.
+* Click checkbox **I understand the above recommendation and want to proceed to create an access key**.
+* Click **Next** → **Create**.
 * Click **Download .csv** to store your Access/Secret key. These are the access credentials that the plugin will use to programmatically access Amazon S3.
 
 Now that the user was created, let's access the Wordpress instance via the EC2 instance's public address.
@@ -59,8 +65,8 @@ Now that the user was created, let's access the Wordpress instance via the EC2 i
 
 Let's add an image to the page now to see if our setup works.
 
-* In the menu on the left again, click **Page** > **All pages**, 
-* Hover over **Simple page**, then click **Edit** in the menu below.
+* In the menu on the left again, click **Pages** > **All pages**, 
+* Hover over **Sample page**, then click **Edit** in the menu below.
 * On the edit page, a info dialog may pop up, that you can close. After that, click the **[+]** icon on the top left and insert an image. Choose one from your local machine, or copy/paste any image URL from the web (such as [this](https://d1.awsstatic.com/logos/aws-logo-lockups/poweredbyaws/PB_AWS_logo_RGB_REV_SQ.8c88ac215fe4e441dc42865dd6962ed4f444a90d.png)).
 * Click **Update** to confirm the change.
 
@@ -78,4 +84,4 @@ Now, you can view your sample page by going to your  `<your ec2 domain>/index.ph
 
 ![](/images/lab1-26.png)
 
-If you open the [S3 console](https://s3.console.aws.amazon.com/s3/buckets?region=us-east-1&region=us-east-1), you will also find all the files now in the bucket.
+If you open the [S3 console](https://s3.console.aws.amazon.com/s3/buckets?region=us-east-1&region=us-east-1), you will also find all the files now in the bucket.
diff --git a/content/Lab2/Step1/_index.en.md b/content/Lab2/Step1/_index.en.md
@@ -27,7 +27,7 @@ $_SERVER['HTTPS'] = 'on';
 ![](/images/lab2-1.png)
 
 * Visit **EC2/Load Balancing/Load Balancers**
-* Click **Create Load Balalncer**
+* Click **Create Load Balancer**
 
 ![](/images/lab2-2.png)
 
@@ -43,7 +43,11 @@ $_SERVER['HTTPS'] = 'on';
 
 * In **Step 2: Configure Security Settings**, click **Next**
 * In **Step 3: Configure Security Groups**, for **Assign a security group**, choose **Create a new security group**
-* For **Security group name**, enter `alb-sg` and click **Next Configure Routing**
+* For **Security group name**, enter `alb-sg`
+* For **VPC**, choose **Vpc / vpc-stack**
+* Click **Add rule** in **Inbound rules** section.
+* For **Type**, select **HTTP**
+* For **Source**, select **Anywhere-IPv4** and click **Create security group**
 
 ![](/images/lab2-5.png)
 

diff --git a/content/Lab2/Step4/_index.en.md b/content/Lab2/Step4/_index.en.md
@@ -10,7 +10,14 @@ tags:
   - EC2
 ---
 
-* Find the Domain name of ALB Created in Step 1, paste it on browser to visit your WordPress page, scroll down and click **Log in** to enter the admin page
+* Connect to the EC2 Inctance that was launched in Lab 1
+* Disable https for this intance - comment `$_SERVER['HTTPS'] = 'on';`
+* start the web service
+```
+sudo service httpd start
+sudo systemctl restart php-fpm
+```
+* Copy the EC2 instance **Public IPv4 DNS** url add to it `/wp-admin`, paste it on browser to enter the admin page
 
 ![](/images/lab2-21.png)
 

diff --git a/content/_index.en.md b/content/_index.en.md
@@ -1,6 +1,7 @@
 This workshop is a hands-on tutorial of building a website on AWS. You will learn how to build a high-availability application on AWS using the [**AWS Management Console**](https://aws.amazon.com/console/). In Lab 1, we will build a single-instance WordPress website using [**Amazon EC2**](https://aws.amazon.com/ec2) and [**Amazon RDS**](https://aws.amazon.com/rds/). In Lab 2, we will then further improve the architecture by adding an [**Auto Scaling Group**](https://docs.aws.amazon.com/autoscaling/ec2/userguide/AutoScalingGroup.html), an Application Load Balancer ([**Elastic Load Balancing**](https://aws.amazon.com/elasticloadbalancing/?nc=sn&loc=0)) and a Content Distribution Network ([**AWS CloudFront**](https://aws.amazon.com/cloudfront)), making the website more scalable, secure and reliable.
 
-Note: the diagrams in this workshop are only for reference - they may not be up-to-date with the latest version of this workshop.
+**Note:** the diagrams and images in this workshop are only for reference - they may not be up-to-date with the latest version of this workshop. 
+Elements order, inputs, field names and other UI elements can be changed. **Text is the primary source of truth.** 
 
 * Target audience: AWS Beginners
 * Level: 100

diff --git a/static/images/lab1-0.png b/static/images/lab1-0.png
diff --git a/static/images/lab1-1.png b/static/images/lab1-1.png
diff --git a/static/images/lab1-10.png b/static/images/lab1-10.png
diff --git a/static/images/lab1-11.png b/static/images/lab1-11.png
diff --git a/static/images/lab1-12.png b/static/images/lab1-12.png
diff --git a/static/images/lab1-13.png b/static/images/lab1-13.png
diff --git a/static/images/lab1-14.png b/static/images/lab1-14.png
diff --git a/static/images/lab1-15.png b/static/images/lab1-15.png
diff --git a/static/images/lab1-16.png b/static/images/lab1-16.png
diff --git a/static/images/lab1-2.png b/static/images/lab1-2.png
diff --git a/static/images/lab1-20.png b/static/images/lab1-20.png
diff --git a/static/images/lab1-3.png b/static/images/lab1-3.png
diff --git a/static/images/lab1-4.png b/static/images/lab1-4.png
diff --git a/static/images/lab1-5.png b/static/images/lab1-5.png
diff --git a/static/images/lab1-6.png b/static/images/lab1-6.png
diff --git a/static/images/lab1-7.png b/static/images/lab1-7.png
diff --git a/static/images/lab1-8.png b/static/images/lab1-8.png
diff --git a/static/images/lab1-9.png b/static/images/lab1-9.png