From 149a7305b74aa7703bdd347b5cbaa73f7780e7e6 Mon Sep 17 00:00:00 2001
From: Ned Wright <nedwright@proton.me>
Date: Thu, 7 Sep 2023 14:54:40 +0000
Subject: [PATCH] Remove old deafult fog

---
 nodes/orchestration/CMakeLists.txt                   | 2 +-
 nodes/orchestration/package/cp-nano-cli.sh           | 3 +--
 nodes/orchestration/package/open-appsec-ctl.sh       | 3 +--
 nodes/orchestration/package/orchestration_package.sh | 3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/nodes/orchestration/CMakeLists.txt b/nodes/orchestration/CMakeLists.txt
index 836d8af..1d4367c 100755
--- a/nodes/orchestration/CMakeLists.txt
+++ b/nodes/orchestration/CMakeLists.txt
@@ -119,7 +119,7 @@ execute_process (
 install(FILES ${ssl2} DESTINATION orchestration/lib)
 
 execute_process (
-	COMMAND bash -c "find /usr/lib -name \"libcurl.so\" | awk '{printf $1\";\"}'"
+	COMMAND bash -c "find /usr/lib -name \"libcurl.so*\" | awk '{printf $1\";\"}'"
 	OUTPUT_VARIABLE curl
 )
 install(FILES ${curl} DESTINATION orchestration/lib)
diff --git a/nodes/orchestration/package/cp-nano-cli.sh b/nodes/orchestration/package/cp-nano-cli.sh
index c9c88b1..2bf04f9 100755
--- a/nodes/orchestration/package/cp-nano-cli.sh
+++ b/nodes/orchestration/package/cp-nano-cli.sh
@@ -23,7 +23,6 @@ AI_VERBOSE=false
 PROFILE_SETTINGS_JSON_PATH=$cp_nano_conf_location/settings.json
 DEFAULT_HEALTH_CHECK_TMP_FILE_PATH="/tmp/cpnano_health_check_output.txt"
 
-var_default_fog_address="i2-agents.cloud.ngen.checkpoint.com/"
 var_default_gem_fog_address="inext-agents.cloud.ngen.checkpoint.com"
 var_default_us_fog_address="inext-agents-us.cloud.ngen.checkpoint.com"
 
@@ -1439,7 +1438,7 @@ set_mode()
             elif [ "${var_token#"$gem_prefix"}" != "${var_token}" ] || [ "${var_token#"$gem_prefix_uppercase"}" != "${var_token}" ]; then
                 var_fog_address="$var_default_gem_fog_address"
             else
-                var_fog_address="$var_default_fog_address"
+                echo "Failed to get fog address from toekn: ${var_token} - check if token is legal"
             fi
             fog_address=$var_fog_address
         elif [ -z "$token" ]; then
diff --git a/nodes/orchestration/package/open-appsec-ctl.sh b/nodes/orchestration/package/open-appsec-ctl.sh
index 76db1f9..a6eb761 100644
--- a/nodes/orchestration/package/open-appsec-ctl.sh
+++ b/nodes/orchestration/package/open-appsec-ctl.sh
@@ -23,7 +23,6 @@ AI_VERBOSE=false
 PROFILE_SETTINGS_JSON_PATH=$cp_nano_conf_location/settings.json
 DEFAULT_HEALTH_CHECK_TMP_FILE_PATH="/tmp/cpnano_health_check_output.txt"
 
-var_default_fog_address="i2-agents.cloud.ngen.checkpoint.com/"
 var_default_gem_fog_address="inext-agents.cloud.ngen.checkpoint.com"
 var_default_us_fog_address="inext-agents-us.cloud.ngen.checkpoint.com"
 var_default_au_fog_address="inext-agents-aus1.cloud.ngen.checkpoint.com"
@@ -1481,7 +1480,7 @@ set_mode()
             elif [ "${var_token#"$gem_prefix"}" != "${var_token}" ] || [ "${var_token#"$gem_prefix_uppercase"}" != "${var_token}" ]; then
                 var_fog_address="$var_default_gem_fog_address"
             else
-                var_fog_address="$var_default_fog_address"
+                echo "Failed to get fog address from token: ${var_token} - check if token is legal"
             fi
             fog_address=$var_fog_address
         elif [ -z "$token" ]; then
diff --git a/nodes/orchestration/package/orchestration_package.sh b/nodes/orchestration/package/orchestration_package.sh
index b2faa67..47e2457 100755
--- a/nodes/orchestration/package/orchestration_package.sh
+++ b/nodes/orchestration/package/orchestration_package.sh
@@ -40,7 +40,6 @@ EGG_MODE=
 ORCHESTRATION_CONF_FILE="${CONF_PATH}/cp-nano-orchestration-conf.json"
 ORCHESTRATION_DEBUG_CONF_FILE="${CONF_PATH}/cp-nano-orchestration-debug-conf.json"
 DEFAULT_SETTINGS_PATH="${CONF_PATH}/settings.json"
-var_default_fog_address="https://i2-agents.cloud.ngen.checkpoint.com/"
 var_default_gem_fog_address="https://inext-agents.cloud.ngen.checkpoint.com"
 var_default_us_fog_address="https://inext-agents-us.cloud.ngen.checkpoint.com"
 var_default_au_fog_address="https://inext-agents-aus1.cloud.ngen.checkpoint.com"
@@ -346,7 +345,7 @@ if [ "$RUN_MODE" = "install" ] && [ $var_offline_mode = false ]; then
             elif [ "${var_token#"$gem_prefix"}" != "${var_token}" ] || [ "${var_token#"$gem_prefix_uppercase"}" != "${var_token}" ]; then
                 var_fog_address="$var_default_gem_fog_address"
             else
-                var_fog_address="$var_default_fog_address"
+                echo "Failed to get fog address from token: ${var_token} - check if token is legal"
             fi
         fi
     fi