Update preinstall script to update agent config from V2 to V3

Author: dhurley

scripts/packages/preinstall.sh

@@ -16,6 +16,7 @@ INSTANCE_GROUP=""
 ################################
 ###### Default variables
 ################################
+export NGINX_ONE_HOST="${NGINX_AGENT_SERVER_HOST:-agent.connect.nginx.com}"
 export AGENT_GROUP="${AGENT_GROUP:-$(id -ng)}"
 RED='\033[0;31m'
 NC='\033[0m'
@@ -118,12 +119,13 @@ update_config_file() {
         echo "Backing up NGINX Agent V2 configuration to /etc/nginx-agent/nginx-agent-v2-backup.conf"
         cp $AGENT_CONFIG_FILE /etc/nginx-agent/nginx-agent-v2-backup.conf
 
-        nginx_one_host="agent.connect.nginx.com"
         v2_config_file=$AGENT_CONFIG_FILE
         v3_config_file=$AGENT_CONFIG_FILE
 
-        if grep -q "$nginx_one_host" ${v2_config_file}; then
-            echo "N1 connected agent"
+        echo "NGINX Agent server host should be ${NGINX_ONE_HOST}"
+        
+        if grep -q "$NGINX_ONE_HOST" ${v2_config_file}; then
+            echo "NGINX One connected agent"
         else 
             echo "${RED}Previous version of NGINX Agent was not connected to NGINX One. Stopping upgrade.${NC}" 
             exit 1
@@ -158,7 +160,7 @@ allowed_directories: ${allowed_directories}
 
 command:
     server:
-        host: ${nginx_one_host}
+        host: ${NGINX_ONE_HOST}
         port: 443
     auth:
         token: ${token}
@@ -179,7 +181,7 @@ collector:
   exporters:
     otlp_exporters:
       - server:
-          host: ${nginx_one_host}
+          host: ${NGINX_ONE_HOST}
           port: 443
         authenticator: headers_setter
         tls:
@@ -190,7 +192,7 @@ collector:
         - action: insert
           key: \"authorization\"
           value: ${token}
-            "
+        "
 
         echo "${v3_config_contents}" > $v3_config_file
     fi

scripts/packages/upgrade-agent-config.sh

@@ -6,9 +6,9 @@ set -e
 # Description:
 # NGINX Agent script for converting NGINX AGENT V2 config format to V3 config format
 
+export NGINX_ONE_HOST="${NGINX_AGENT_SERVER_HOST:-agent.connect.nginx.com}"
 RED='\033[0;31m'
 NC='\033[0m'
-N1_HOST="agent.connect.nginx.com"
 
 for i in "$@"; do
   case $i in
@@ -29,10 +29,9 @@ for i in "$@"; do
   esac
 done
 
-echo "V2 config file path = ${v2_config_file}"
-echo "V3 config file path = ${v3_config_file}"
+echo "NGINX Agent server host should be ${NGINX_ONE_HOST}"
 
-if grep -q "$N1_HOST" ${v2_config_file}; then
+if grep -q "$NGINX_ONE_HOST" ${v2_config_file}; then
     echo "N1 connected agent"
 else 
     echo "${RED}Previous version of NGINX Agent was not connected to NGINX One. Stopping upgrade.${NC}" 
@@ -68,7 +67,7 @@ allowed_directories: ${allowed_directories}
 
 command:
     server:
-        host: ${N1_HOST}
+        host: ${NGINX_ONE_HOST}
         port: 443
     auth:
         token: ${token}
@@ -89,7 +88,7 @@ collector:
   exporters:
     otlp_exporters:
       - server:
-          host: ${N1_HOST}
+          host: ${NGINX_ONE_HOST}
           port: 443
         authenticator: headers_setter
         tls:

test/docker/nginx-official-image/apk/Dockerfile

@@ -12,7 +12,7 @@ WORKDIR /agent
 COPY ./build/${PACKAGE_NAME}.apk /agent/build/${PACKAGE_NAME}.apk
 COPY ./ /agent
 
-RUN apk del nginx-agent \
+RUN apk del nginx-agent
 RUN apk add --allow-untrusted /agent/build/${PACKAGE_NAME}.apk
 
 RUN unlink /var/log/nginx/access.log

test/docker/nginx-official-image/deb/Dockerfile

@@ -13,7 +13,7 @@ WORKDIR /agent
 COPY ./build/${PACKAGE_NAME}.deb /agent/build/${PACKAGE_NAME}.deb
 COPY ./ /agent
 
-RUN  apt-get update \ 
+RUN  apt-get update \
     && apt purge -y nginx-agent \
     && apt install --no-install-recommends --no-install-suggests -y /agent/build/${PACKAGE_NAME}.deb \ 
     &&  rm /agent/build/${PACKAGE_NAME}.deb