readme updates

README.md

@@ -62,7 +62,7 @@ See [Lab0 prerequisites](/labs/lab0/prerequisites.md) for the Hardware/Software
 
 Review the Github Repo content for the NGINX Basics Workshop 101.  If you have taken this Workshop, and understand the content, you can successfully complete the Lab exercises in this NGINX One Console Workshop.  It is HIGHLY recommended that you complete the 101 Workshop prior.  
 
-It will take approximately 1 hour to complete the NGINX One Console Workshop.
+It will take approximately 2-3 hour to complete the NGINX One Console Workshop.
 
 <br/>
 

labs/lab0/readme.md

@@ -27,72 +27,102 @@ Look for an email from **`[email protected]`**. This will have instructi
 ## Step 1: Get yourself to UDF
 
 - Navigate to [https://udf.f5.com/](https://udf.f5.com/) and select `Invited Users`
+
     ![Non F5](media/udfloginnonf5.png)
 
 - If this is your first time using UDF, use the `Sign Up` link which would take your to F5 registration page.
 
-  **NOTE:** this will *not be the password to the Ubuntu Desktop or other VMs in the class!*
+    >**NOTE:** this will *not be the password to the Ubuntu Desktop or other VMs in the class!*
+
     ![Sign up](media/F5signup.png)
 
 - Once you have filled in your registration details, you should be receiving an `Account Activation` email as shown below
-  ![Account Activation Email](media/F5accountactivationemail.png)
+
+    ![Account Activation Email](media/F5accountactivationemail.png)
 
 - When you click on the `Activate Account` button within the activation email, you would be redirected to setup 2 factor authentication as shown below. Select your preferred authentication method.
-  ![2factor Authentication prompt](media/2factorAuthentication.png)
+
+    ![2factor Authentication prompt](media/2factorAuthentication.png)
 
 - Once you have set up 2 factor authentication successfully, you will see a `green` checkmark on your preferred method. Click on `Finish`.
-  ![2factor Confirmation](media/2factorConfirmation.png)
+
+    ![2factor Confirmation](media/2factorConfirmation.png)
 
 - If you already have an account but you can't remember your password, simply reset your password by clicking on `Forgot Password?` link.
-![Non F5](media/udfloginreset.png "happens to the best of us")
+
+    ![Non F5](media/udfloginreset.png "happens to the best of us")
 
 ## Step 2: Start the course
 
 - Once logged into UDF, click `Launch` (This will open a new tab.)
-  ![Non F5](media/courselist.png "click launch")
+
+    ![Non F5](media/courselist.png "click launch")
 
 - And then click on `Join`
-  ![Non F5](media/joinbutton.png "'Yes I'm sure'")
+
+    ![Non F5](media/joinbutton.png "'Yes I'm sure'")
 
 - Click the `DEPLOYMENT` tab at the top
-![Non F5](media/almostthere.png "I'm up here")
 
-## Step 3: RDP to the Ubuntu Jumpbox
+    ![Non F5](media/almostthere.png "I'm up here")
+
+## Step 3: RDP to the Jumphost
 
-- username: `ubuntu`
-- password: `Nginx123`
+- Wait for the Jumphost to finish booting. . .
 
-THIS REQUIRES AN RDP CLIENT! If you have a Mac *and* haven't downloaded an RDP client before, here is the first-party version:
+    ![Non F5](media/waitforboot.png "loading. . .")
 
-[Microsoft's RDP client on the Apple Apps Store](https://apps.apple.com/us/app/microsoft-remote-desktop/id1295203466?mt=12)
+- There are two ways to RDP to the Jumphost
 
-- Now you just have to wait for the Ubuntu Desktop to finish booting. . .
+    ![Non F5](media/launchrdp.png "almost there")
 
-![Non F5](media/waitforboot.png "loading. . .")
+  ### OPTION 1: Using **Apache Guacamole**
 
-- Make sure to select a small enough resolution to see the whole screen.
+  ![Apache Guacamole](media/apache_guacamole.png)
+
+  This workshop is enabled with Apache Guacamole, which is a clientless remote desktop gateway.
 
-![Non F5](media/launchrdp.png "almost there")
+  - To use Apache Guacamole, select `Guacamole` from the ACCESS drop down for the Jumphost.
 
-- Once you select the resolution, your browser will download an rdp file. Open this file to connect to Ubuntu Desktop.
+  - Click on "Allow" for the popup and then enter below credentials.
 
-- Accept the self-signed cert, the Ubuntu Desktop username and password will be `ubuntu` and `Nginx123`.
+      ![Guacamole Login](media/guacamole_login.png)
 
-  (**NOTE:** This is *not* your UDF login username & password.)
+  - In the next window click on "OK" and then enter the login password (`Nginx123`) to log into the Jumphost.
 
-  ![Non F5](media/useruser.png)
+      ![Non F5](media/useruser.png)
 
--------------
-> **If you can't connect to the Ubuntu Desktop, *remember to shut off your VPN*, or join a non-proxied network (sometimes a guest network in the office will work)**
--------------
+  ### OPTION 2: Using **xRDP**
+
+  ![RDP](media/rdp.png)
+
+  THIS OPTION REQUIRES AN RDP CLIENT! If you have a Mac *and* haven't downloaded an RDP client before, here is the first-party version:
+
+  [Microsoft's RDP client on the Apple Apps Store](https://apps.apple.com/us/app/microsoft-remote-desktop/id1295203466?mt=12)
+
+  - To use your RDP client, select `xRDP` from the ACCESS drop down for the Jumphost. Make sure to select a small enough resolution to see the whole screen.
+
+  - Once you select the resolution, your browser will download an rdp file. Open this file to connect to the Jumphost.
+
+  - Accept the self-signed cert and then enter the login password (`Nginx123`) to log into the Jumphost.
+
+    (**NOTE:** This is *not* your UDF login password.)
+
+    ![Non F5](media/useruser.png)
+
+    > **If you can't connect to the Jumphost, *remember to shut off your VPN*, or join a non-proxied network (sometimes a guest network in the office will work)**
+
+    **For machines running Windows and attached to a domain, Windows will helpfully attempt to use your domain creds to log in, and you'll see:**
+
+    ![Non F5](media/domaincreds.png "everyone has credentials.com email accounts right?")
 
-**For machines running Windows and attached to a domain, Windows will helpfully attempt to use your domain creds to log in, and you'll see:**
+    **Click "More choices" to enter both a username and a password**
 
-![Non F5](media/domaincreds.png "everyone has credentials.com email accounts right?")
+    ![Non F5](media/domaincredsannotated.png "green arrows")
 
-### Click "More choices" to enter both a username and a password
+- Irrespective of which Option you choose to RDP to Jumphost, once logged in you should see an ubuntu desktop as below screenshot.
 
-![Non F5](media/domaincredsannotated.png "green arrows")
+  ![rdp desktop](media/rdp_desktop.png)
 
 That wraps the pre-requisites.
 

labs/lab3/readme.md

@@ -350,12 +350,11 @@ If you would like to just run a few containers without Docker Compose, here are
     curl https://docker-registry.nginx.com/v2/nginx/agent/tags/list | jq
     ```
 
-1. Find all the currently available `NGINX Plus` containers with Agent installed. Curl the `NGINX Private Registry` ( **NOTE:** you will need your `nginx-repo Certificate and Key` files to run this command):
+1. Find all the currently available `NGINX Plus` containers with Agent installed. Curl the `NGINX Private Registry` ( **NOTE:** you will use your `nginx-repo.jwt` license file to run this command):
 
     ```bash
-    curl https://private-registry.nginx.com/v2/nginx-plus/agent/tags/list --key nginx-repo.key --cert nginx-repo.crt | jq
+    curl https://private-registry.nginx.com/v2/nginx-plus/agent/tags/list -u $JWT:none | jq
     ```
-
 <br/>
 
 This ends Lab3.

labs/lab5/readme.md

@@ -160,7 +160,7 @@ Don't forget to remove your unused Instances from the NGINX One Console.
 
 ## Install NGINX Plus R32 on a VM
 
-Next you will create an NGINX instance that is pinned to version R32 on a virtual machine. This will show you an upgrade from R32 to the new R33 on a VM, a common NGINX upgrade task. From the Jumphost you can use the terminal to SSH to the VM's command line to do an install. 
+Next you will create an NGINX instance that is pinned to version R32 on a virtual machine. This will show you an upgrade from R32 to the new R33 on a VM, a common NGINX upgrade task. From the Jumphost you can use the terminal to SSH to the VM's command line to do an install.
 
 1. From the VS Studio Terminal window, run the following commands.
 
@@ -170,9 +170,6 @@ Next you will create an NGINX instance that is pinned to version R32 on a virtua
     ssh nplus
     cd ~/Documents
 
-    sudo mkdir -p /etc/nginx/
-    sudo cp license/license.jwt /etc/nginx/license.jwt
-
     sudo mkdir -p /etc/ssl/nginx
     sudo cp license/nginx-repo.* /etc/ssl/nginx/
     ```
@@ -461,7 +458,7 @@ Let's take the previous R32 install you just created and upgrade it. This time y
 
     ![NGINX Plus](media/lab5-add-license-1.png)
 
-    Copy the value from the `~/Downloads/license/license.jwt` and enter it into this file. Click the `Next` button.
+    Copy the value from the `lab5/license.jwt` and enter it into this file. Click the `Next` button.
 
     >**NOTE:** Make sure you do not add any extra spaces or characters to the license file or it would be considered invalid.