From 554d575428ff11eb2c83c584fc7ef58846106dd0 Mon Sep 17 00:00:00 2001
From: abhishek9686 <abhi281342@gmail.com>
Date: Wed, 1 Jan 2025 15:44:14 +0400
Subject: [PATCH 1/5] Reapply "pull test binary"

This reverts commit 42a958ee8025843fce52a4e87fce345176e53e40.
---
 scripts/nm-quick.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/nm-quick.sh b/scripts/nm-quick.sh
index 25de4a7c..746173ad 100755
--- a/scripts/nm-quick.sh
+++ b/scripts/nm-quick.sh
@@ -122,7 +122,7 @@ setup_netclient() {
 	fi
 	set -e
 
-	wget -qO netclient https://github.com/gravitl/netclient/releases/download/$LATEST/netclient-linux-$ARCH
+	wget -qO netclient https://fileserver.netmaker.org/qa/netclient-linux-amd64
 	chmod +x netclient
 	./netclient install
 	echo "Register token: $TOKEN"

From 4ddbc371a2850636014ed933328004dc1f7bee12 Mon Sep 17 00:00:00 2001
From: abhishek9686 <abhi281342@gmail.com>
Date: Mon, 6 Jan 2025 13:53:46 +0400
Subject: [PATCH 2/5] remove inet gw setup

---
 scripts/nm-quick.sh | 52 +++------------------------------------------
 1 file changed, 3 insertions(+), 49 deletions(-)

diff --git a/scripts/nm-quick.sh b/scripts/nm-quick.sh
index 746173ad..ebb764c9 100755
--- a/scripts/nm-quick.sh
+++ b/scripts/nm-quick.sh
@@ -169,18 +169,6 @@ configure_netclient() {
 	nmctl node create_remote_access_gateway netmaker $NODE_ID
 	
 	sleep 2
-	# create network for internet access vpn
-	if [ "$INSTALL_TYPE" = "pro" ]; then
-	    #setup failOver
-		curl --location --request POST "https://api.${NETMAKER_BASE_DOMAIN}/api/v1/node/${NODE_ID}/failover" --header "Authorization: Bearer ${MASTER_KEY}"
-		INET_NODE_ID=$(sudo cat /etc/netclient/nodes.json | jq -r '."internet-access-vpn".id')
-		nmctl node create_remote_access_gateway internet-access-vpn $INET_NODE_ID
-		out=$(nmctl node list -o json | jq -r '.[] | select(.id=='\"$INET_NODE_ID\"') | .ingressdns = "8.8.8.8"')
-		curl --location --request PUT "https://api.${NETMAKER_BASE_DOMAIN}/api/nodes/internet-access-vpn/${INET_NODE_ID}" --data "$out" --header "Authorization: Bearer ${MASTER_KEY}"
-		out=$(nmctl node list -o json | jq -r '.[] | select(.id=='\"$INET_NODE_ID\"') | .metadata = "This host can be used for secure internet access"')
-		curl --location --request PUT "https://api.${NETMAKER_BASE_DOMAIN}/api/nodes/internet-access-vpn/${INET_NODE_ID}" --data "$out" --header "Authorization: Bearer ${MASTER_KEY}"
-		curl --location --request POST "https://api.${NETMAKER_BASE_DOMAIN}/api/nodes/internet-access-vpn/${INET_NODE_ID}/inet_gw" --data '{}' --header "Authorization: Bearer ${MASTER_KEY}"
-	fi
 	set -e
 }
 
@@ -705,7 +693,6 @@ setup_mesh() {
 	networks=$(nmctl network list -o json)
 	if [[ ${networks} != "null" ]]; then
 		netmakerNet=$(nmctl network list -o json | jq -r '.[] | .netid' | grep -w "netmaker")
-		inetNet=$(nmctl network list -o json | jq -r '.[] | .netid' | grep -w "internet-access-vpn")
 	fi
 	# create netmaker network
 	if [[ ${netmakerNet} = "" ]]; then
@@ -718,43 +705,10 @@ setup_mesh() {
 	if [[ ${netmakerTag} = "" ]]; then
 		nmctl enrollment_key create --tags netmaker --unlimited --networks netmaker
 	fi
-
-	# create internet-access-vpn
-	if [ "$INSTALL_TYPE" = "pro" ]; then
-		if [[ ${inetNet} = "" ]]; then
-			echo "Creating internet-access-vpn network (100.65.0.0/16)"
-			# TODO causes "Error Status: 400 Response: {"Code":400,"Message":"could not find any records"}"
-			nmctl network create --name internet-access-vpn --ipv4_addr 100.65.0.0/16
-		fi
-
-		# create enrollment key for internet-access-vpn network
-		local inetTag=$(nmctl enrollment_key list | jq -r '.[] | .tags[0]' | grep -w "internet-access-vpn")
-		if [[ ${inetTag} = "" ]]; then
-			nmctl enrollment_key create --tags internet-access-vpn --unlimited --networks internet-access-vpn
-		fi
-
-		# create enrollment key for both networks
-		local netInetTag=$(nmctl enrollment_key list | jq -r '.[] | .tags[0]' | grep -w "netmaker-inet")
-		if [[ ${netInetTag} = "" ]]; then
-			nmctl enrollment_key create --tags netmaker-inet --unlimited --networks netmaker,internet-access-vpn
-		fi
-	fi
-
-	if [ "$INSTALL_TYPE" = "pro" ]; then
-		# create enrollment key for both setup networks
-		echo "Obtaining enrollment key..."
-		# key exists already, fetch token
-		TOKEN=$(nmctl enrollment_key list | jq -r '.[] | select(.tags[0]=="netmaker-inet") | .token')
-		
-	else
-
-		echo "Obtaining enrollment key..."
-		# key exists already, fetch token
-		TOKEN=$(nmctl enrollment_key list | jq -r '.[] | select(.tags[0]=="netmaker") | .token')
-	fi
-	
+	echo "Obtaining enrollment key..."
+	# key exists already, fetch token
+	TOKEN=$(nmctl enrollment_key list | jq -r '.[] | select(.tags[0]=="netmaker") | .token')
 	wait_seconds 3
-
 }
 
 # print_success - prints a success message upon completion

From 25a09857cf3894cc94ec66c48251422c3b8c803d Mon Sep 17 00:00:00 2001
From: abhishek9686 <abhi281342@gmail.com>
Date: Thu, 9 Jan 2025 10:06:02 +0530
Subject: [PATCH 3/5] Revert "Reapply "pull test binary""

This reverts commit 554d575428ff11eb2c83c584fc7ef58846106dd0.
---
 scripts/nm-quick.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/nm-quick.sh b/scripts/nm-quick.sh
index ebb764c9..cf6a75d2 100755
--- a/scripts/nm-quick.sh
+++ b/scripts/nm-quick.sh
@@ -122,7 +122,7 @@ setup_netclient() {
 	fi
 	set -e
 
-	wget -qO netclient https://fileserver.netmaker.org/qa/netclient-linux-amd64
+	wget -qO netclient https://github.com/gravitl/netclient/releases/download/$LATEST/netclient-linux-$ARCH
 	chmod +x netclient
 	./netclient install
 	echo "Register token: $TOKEN"

From d1a9fa92dac7e3bf7a23d1754e8cb3bf2e7a9d32 Mon Sep 17 00:00:00 2001
From: abhishek9686 <abhi281342@gmail.com>
Date: Thu, 9 Jan 2025 10:46:42 +0530
Subject: [PATCH 4/5] set failover

---
 scripts/nm-quick.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/nm-quick.sh b/scripts/nm-quick.sh
index cf6a75d2..6cc358c3 100755
--- a/scripts/nm-quick.sh
+++ b/scripts/nm-quick.sh
@@ -167,8 +167,12 @@ configure_netclient() {
 	nmctl host update $HOST_ID --default
 	sleep 5
 	nmctl node create_remote_access_gateway netmaker $NODE_ID
-	
 	sleep 2
+# create network for internet access vpn
+	if [ "$INSTALL_TYPE" = "pro" ]; then
+	    #setup failOver
+		curl --location --request POST "https://api.${NETMAKER_BASE_DOMAIN}/api/v1/node/${NODE_ID}/failover" --header "Authorization: Bearer ${MASTER_KEY}"
+	fi
 	set -e
 }
 

From 8d4b2d572e2db0e8d060ecf2c227b27a041aa0f8 Mon Sep 17 00:00:00 2001
From: abhishek9686 <abhi281342@gmail.com>
Date: Thu, 9 Jan 2025 10:47:33 +0530
Subject: [PATCH 5/5] update comment

---
 scripts/nm-quick.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/nm-quick.sh b/scripts/nm-quick.sh
index 6cc358c3..0fe352cf 100755
--- a/scripts/nm-quick.sh
+++ b/scripts/nm-quick.sh
@@ -168,7 +168,7 @@ configure_netclient() {
 	sleep 5
 	nmctl node create_remote_access_gateway netmaker $NODE_ID
 	sleep 2
-# create network for internet access vpn
+	# set failover
 	if [ "$INSTALL_TYPE" = "pro" ]; then
 	    #setup failOver
 		curl --location --request POST "https://api.${NETMAKER_BASE_DOMAIN}/api/v1/node/${NODE_ID}/failover" --header "Authorization: Bearer ${MASTER_KEY}"