From 8ed6fc675064327e996b2ce195374f776b89945f Mon Sep 17 00:00:00 2001 From: brucec Date: Thu, 21 Mar 2019 16:49:09 -0700 Subject: [PATCH] Adding callhome metadata file for terraform, ARM and cloudformation --- .../scripts/install_artifactory.sh | 9 +++++++++ CloudFormation/artifactory-enterprise.json | 20 +++++++++++++++++++ Terraform/userdata.sh | 2 +- 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/AzureResourceManager/scripts/install_artifactory.sh b/AzureResourceManager/scripts/install_artifactory.sh index 225964a..e703053 100644 --- a/AzureResourceManager/scripts/install_artifactory.sh +++ b/AzureResourceManager/scripts/install_artifactory.sh @@ -209,6 +209,15 @@ cat </var/opt/jfrog/artifactory/etc/binarystore.xml EOF +# callhome metadata + +mkdir -p /var/opt/jfrog/artifactory/etc/info +cat </var/opt/jfrog/artifactory/etc/info/installer-info.json +{ + "productId": "JFrogInstaller_Azure_SQL/1.0.0" +} +EOF + HOSTNAME=$(hostname -i) sed -i -e "s/art1/art-$(date +%s$RANDOM)/" /var/opt/jfrog/artifactory/etc/ha-node.properties sed -i -e "s/127.0.0.1/$HOSTNAME/" /var/opt/jfrog/artifactory/etc/ha-node.properties diff --git a/CloudFormation/artifactory-enterprise.json b/CloudFormation/artifactory-enterprise.json index 3faf68b..34b2d7b 100644 --- a/CloudFormation/artifactory-enterprise.json +++ b/CloudFormation/artifactory-enterprise.json @@ -902,6 +902,16 @@ " --region ", { "Ref" : "AWS::Region" }, "\n", "runas=root\n" ]]} + }, + "/var/opt/jfrog/artifactory/etc/info/installer-info.json" : { + "content" : { "Fn::Join" : ["", [ + "{\n", + " \"productId\": \"JFrogInstaller_Azure_SQL/1.0.0\"\n", + "}\n" + ]]}, + "mode" : "000755", + "owner" : "artifactory", + "group" : "artifactory" } }, @@ -1254,6 +1264,16 @@ " --region ", { "Ref" : "AWS::Region" }, "\n", "runas=root\n" ]]} + }, + "/var/opt/jfrog/artifactory/etc/info/installer-info.json" : { + "content" : { "Fn::Join" : ["", [ + "{\n", + " \"productId\": \"JFrogInstaller_Azure_SQL/1.0.0\"\n", + "}\n" + ]]}, + "mode" : "000755", + "owner" : "artifactory", + "group" : "artifactory" } }, diff --git a/Terraform/userdata.sh b/Terraform/userdata.sh index 77111e9..277677a 100644 --- a/Terraform/userdata.sh +++ b/Terraform/userdata.sh @@ -175,7 +175,7 @@ EOF mkdir -p /var/opt/jfrog/artifactory/etc/info cat </var/opt/jfrog/artifactory/etc/info/installer-info.json { - "productId": "JFrogMysqlTerraformInstaller/1.0.0" + "productId": "JFrog_TerraformInstaller_Mysql/1.0.0" } EOF