From 1e14d18b04f42fcbbabc5e9dd8c201f9e0886d52 Mon Sep 17 00:00:00 2001 From: danielmkn Date: Wed, 10 Feb 2021 18:10:43 -0800 Subject: [PATCH 1/2] ARM templates. Callhome is different if ARM template is installed in gov region --- .../Artifactory/scripts/install_artifactory7.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/AzureResourceManager/Artifactory/scripts/install_artifactory7.sh b/AzureResourceManager/Artifactory/scripts/install_artifactory7.sh index 0380132..de90fd2 100644 --- a/AzureResourceManager/Artifactory/scripts/install_artifactory7.sh +++ b/AzureResourceManager/Artifactory/scripts/install_artifactory7.sh @@ -264,9 +264,16 @@ cat /tmp/temp.key | sed 's/KEY----- /&\n/' | sed 's/ -----END/\n-----END/' | awk rm /tmp/temp.key fi -cat </var/opt/jfrog/artifactory/etc/info/installer-info.json + +if [[ "${LOCATION}" =~ $regex_location_gov ]] || [[ "${LOCATION}" =~ $regex_location_dod ]]; then + CALLHOME_SUFFIX=gov +else + CALLHOME_SUFFIX=template +fi + +cat <installer-info.json { - "productId": "ARM_artifactory-pro-template/1.0.0", + "productId": "ARM_artifactory-pro-${CALLHOME_SUFFIX}/1.0.0", "features": [ { "featureId": "Partner/ACC-007221" From a48990bf97934d6511426c82111bebd6581d2f3b Mon Sep 17 00:00:00 2001 From: danielmkn Date: Wed, 10 Feb 2021 18:14:47 -0800 Subject: [PATCH 2/2] ARM templates. Callhome, fixed error --- .../Artifactory/scripts/install_artifactory7.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AzureResourceManager/Artifactory/scripts/install_artifactory7.sh b/AzureResourceManager/Artifactory/scripts/install_artifactory7.sh index de90fd2..19d23f7 100644 --- a/AzureResourceManager/Artifactory/scripts/install_artifactory7.sh +++ b/AzureResourceManager/Artifactory/scripts/install_artifactory7.sh @@ -271,7 +271,7 @@ else CALLHOME_SUFFIX=template fi -cat <installer-info.json +cat </var/opt/jfrog/artifactory/etc/info/installer-info.json { "productId": "ARM_artifactory-pro-${CALLHOME_SUFFIX}/1.0.0", "features": [