Lab5 Updates (#27)

* lab5 updates
---------
Signed-off-by: Shouvik <[email protected]>

Author: sdutta9

labs/lab2/readme.md

@@ -1,44 +1,46 @@
-# NGINX Plus Proxy with tools build
+# NGINX Plus Proxy with NGINX Agent
 # NGINX webservers with ingress-demo pages
-# NGINX Basics, Nov 2024
+# NGINX Basics, Feb 2025
 # Chris Akker, Shouvik Dutta, Adam Currier
 #
 services:
   nginx-plus:                  # NGINX Plus Web / Load Balancer
-    hostname: nginx-plus
-    container_name: nginx-plus
-    image: nginx-plus:workshop  # From Lab1
-    volumes:                    # Sync these folders to container
+    environment:
+      NGINX_AGENT_SERVER_HOST: 'agent.connect.nginx.com'
+      NGINX_AGENT_SERVER_GRPCPORT: '443'
+      NGINX_AGENT_TLS_ENABLE: 'true'
+      NGINX_AGENT_SERVER_TOKEN: $TOKEN # Datakey From One Console
+    hostname: $NAME-nginx-plus
+    container_name: $NAME-nginx-plus
+    image: private-registry.nginx.com/nginx-plus/agent:nginx-plus-r32-alpine-3.20-20240613 # CVE - From Nginx Private Registry
+    volumes:  # Sync these folders to container
         - ./nginx-plus/etc/nginx/nginx.conf:/etc/nginx/nginx.conf
         - ./nginx-plus/etc/nginx/conf.d:/etc/nginx/conf.d
         - ./nginx-plus/etc/nginx/includes:/etc/nginx/includes
         - ./nginx-plus/usr/share/nginx/html:/usr/share/nginx/html
-    links:
-        - web1:web1
-        - web2:web2
-        - web3:web3
     ports:
         - 80:80       # Open for HTTP
         - 443:443     # Open for HTTPS
         - 9000:9000   # Open for API / dashboard page
-    restart: always     
+    restart: always 
+  #    
   web1:
-      hostname: web1
-      container_name: web1
+      hostname: $NAME-web1
+      container_name: $NAME-web1
       image: nginxinc/ingress-demo            # Image from Docker Hub
       ports:
         - "80"                                # Open for HTTP
         - "443"                               # Open for HTTPS
   web2:
-      hostname: web2
-      container_name: web2
+      hostname: $NAME-web2
+      container_name: $NAME-web2
       image: nginxinc/ingress-demo
       ports:
         - "80"
         - "433"
   web3:
-      hostname: web3
-      container_name: web3
+      hostname: $NAME-web3
+      container_name: $NAME-web3
       image: nginxinc/ingress-demo
       ports:
         - "80"

labs/lab4/readme.md

@@ -1,18 +1,18 @@
 # cafe.example.com HTTP
 # NGINX Basics Workshop
-# Feb 2024, Chris Akker, Shouvik Dutta
+# Nov 2024, Chris Akker, Shouvik Dutta, Adam Currier
 #
 server {
 
     listen 80;      # Listening on port 80 on all IP addresses on this machine
 
     server_name cafe.example.com;   # Set hostname to match in request
 
-    # Uncomment the zone directive below to add metrics to the Dashboard
+    # Uncomment the status_zone directive below to add metrics to the Dashboard
     status_zone cafe-VirtualServer;
 
-    # access_log  /var/log/nginx/cafe.example.com.log main;
-    access_log  /var/log/nginx/cafe.example.com.log main_ext;   Extended Logging
+    access_log  /var/log/nginx/cafe.example.com.log main;
+    # access_log  /var/log/nginx/cafe.example.com.log main_ext;   Extended Logging
     error_log   /var/log/nginx/cafe.example.com_error.log info;
 
     location / {

labs/lab5/docker-compose.yml

@@ -1,6 +1,5 @@
-
 user  nginx;
-worker_processes  4;   # Change to use 4 workers/cores
+worker_processes  1;    # Change to use 4 workers/cores
 
 error_log  /var/log/nginx/error.log info;
 pid        /var/run/nginx.pid;
@@ -30,4 +29,4 @@ http {
     #gzip  on;
 
     include /etc/nginx/conf.d/*.conf;
-}
+}

labs/lab5/final/cafe.example.com.conf

@@ -1,27 +1,32 @@
-# NGINX Basics, OSS Proxy to three upstream NGINX web servers
-# Chris Akker, Shouvik Dutta - Feb 2024
+# NGINX Basics, Plus Proxy to three upstream NGINX containers
+# Nov 2024 - Chris Akker, Shouvik Dutta, Adam Currier
 #
-# nginx-cafe servers 
-upstream nginx_cafe {
+# nginx_cafe servers
+
+upstream nginx_cafe {         # Upstream block, the name is "nginx_cafe"
+
+    # Uncomment the zone directive below to add metrics to the Dashboard
+    # zone nginx_cafe 256k;
 
     # Load Balancing Algorithms supported by NGINX
     # - Round Robin (Default if nothing specified)
     # - Least Connections
     # - IP Hash
     # - Hash (Any generic Hash)     
 
-    # Uncomment for Least Connections algorithm      
-    least_conn;
+    # Uncomment for Least Time Last Byte algorithm
+    # least_time last_byte;
 
     # From Docker-Compose:
     server web1:80;
     server web2:80;
     server web3:80;
 
-    # Uncomment for IP Hash persistence
-    # ip_hash;
+    # Uncomment for Cookie persistence
+    # sticky cookie srv_id expires=1m domain=.example.com path=/;
+
 
     # Uncomment for keepalive TCP connections to upstreams
-    keepalive 16;
+    # keepalive 16;
 
 }