From ce2ec0f288aeeb04ed624e643c6ecbc95fcfbab6 Mon Sep 17 00:00:00 2001
From: Yadrishi <97550042+Yadrishi@users.noreply.github.com>
Date: Thu, 15 Jun 2023 21:15:08 +0530
Subject: [PATCH 1/4] Update SOLUTION

---
 projects/bash_networking_security/SOLUTION | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/projects/bash_networking_security/SOLUTION b/projects/bash_networking_security/SOLUTION
index 2edfbaf..1e8216c 100644
--- a/projects/bash_networking_security/SOLUTION
+++ b/projects/bash_networking_security/SOLUTION
@@ -1,16 +1,21 @@
 Local DNS Server IP
 -------------------
-<ip-here>
+ 10.0.0.2
 
 
 
 Default gateway IP
 -------------------
-<ip-here>
+ 10.0.0.1 
 
 
 
 DHCP IP allocation sys-logs
 -------------------
-<logs-here>
+Jun 15 15:12:25 ip-10-0-0-41 dhclient[355]: DHCPDISCOVER on eth0 to 255.255.255.255 port 67 interval 3 (xid=0x73dd755c)
 
+Jun 15 15:12:25 ip-10-0-0-41 dhclient[355]: DHCPOFFER of 10.0.0.41 from 10.0.0.1
+
+Jun 15 15:12:25 ip-10-0-0-41 dhclient[355]: DHCPREQUEST for 10.0.0.41 on eth0 to 255.255.255.255 port 67 (xid=0x5c75dd73)
+
+Jun 15 15:12:25 ip-10-0-0-41 dhclient[355]: DHCPACK of 10.0.0.41 from 10.0.0.1 (xid=0x73dd755c)

From 2c389d6574fdd3bc2ce4ed3a1f3d83f1f71c3396 Mon Sep 17 00:00:00 2001
From: Yadrishi <97550042+Yadrishi@users.noreply.github.com>
Date: Fri, 16 Jun 2023 00:06:33 +0530
Subject: [PATCH 2/4] Update vpc.sh

---
 projects/bash_networking_security/vpc.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/bash_networking_security/vpc.sh b/projects/bash_networking_security/vpc.sh
index 951abba..0763182 100644
--- a/projects/bash_networking_security/vpc.sh
+++ b/projects/bash_networking_security/vpc.sh
@@ -1,4 +1,4 @@
-REGION=""
-VPC_ID=""
-PUBLIC_INSTANCE_ID=""
-PRIVATE_INSTANCE_ID=""
\ No newline at end of file
+REGION="us-west-1"
+VPC_ID="vpc-05495054ca5e34202"
+PUBLIC_INSTANCE_ID="i-0d37c2bb93dd17537"
+PRIVATE_INSTANCE_ID="i-02cdd959f8cf6dac7"

From 5e586003b5ec864c74565839fcd6122379071a5e Mon Sep 17 00:00:00 2001
From: Yadrishi <97550042+Yadrishi@users.noreply.github.com>
Date: Fri, 16 Jun 2023 12:45:21 +0530
Subject: [PATCH 3/4] Update bastion_connect.sh

---
 .../bastion_connect.sh                        | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/projects/bash_networking_security/bastion_connect.sh b/projects/bash_networking_security/bastion_connect.sh
index a9bf588..6c0e78f 100644
--- a/projects/bash_networking_security/bastion_connect.sh
+++ b/projects/bash_networking_security/bastion_connect.sh
@@ -1 +1,27 @@
 #!/bin/bash
+# Check if the KEY_PATH environment variable is set
+if [ -z "$KEY_PATH" ]; then
+  echo "KEY_PATH env var is expected"
+  exit 5
+fi
+
+# Check if the public instance IP is provided
+if [ -z "$1" ]; then
+  echo "Please provide bastion IP address"
+  exit 5
+fi
+
+# If both public and private instance IPs are provided, connect to the private instance via the public instance
+if [ -n "$2" ]; then
+  if ssh -o ConnectTimeout=5 -o StrictHostKeyChecking=no -i "$KEY_PATH" ubuntu@"$1" stat new_key \> /dev/null 2\>\&1; then
+    PRIVATE_KEY_FILE="new_key"
+  else
+    PRIVATE_KEY_FILE="$KEY_PATH"
+  fi
+
+  ssh -ti "$KEY_PATH" ubuntu@"$1" ssh -i "$PRIVATE_KEY_FILE" ubuntu@"$2" "$3"
+
+# Otherwise, connect to the public instance
+else
+  ssh -i "$KEY_PATH" ubuntu@"$1"
+fi

From 6422f3731d2b75307f3cb6afc800caf0ae546ba4 Mon Sep 17 00:00:00 2001
From: Yadrishi <97550042+Yadrishi@users.noreply.github.com>
Date: Fri, 16 Jun 2023 22:48:45 +0530
Subject: [PATCH 4/4] Update vpc.sh

---
 projects/bash_networking_security/vpc.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/bash_networking_security/vpc.sh b/projects/bash_networking_security/vpc.sh
index 0763182..57e67ff 100644
--- a/projects/bash_networking_security/vpc.sh
+++ b/projects/bash_networking_security/vpc.sh
@@ -1,4 +1,4 @@
 REGION="us-west-1"
 VPC_ID="vpc-05495054ca5e34202"
-PUBLIC_INSTANCE_ID="i-0d37c2bb93dd17537"
-PRIVATE_INSTANCE_ID="i-02cdd959f8cf6dac7"
+PUBLIC_INSTANCE_ID="i-0a6f8bcf45bd9dcf8"
+PRIVATE_INSTANCE_ID="i-02d1d83748e76ebf6"