From b304530a09508327b41d1f9944751db9df017233 Mon Sep 17 00:00:00 2001 From: brucec Date: Thu, 21 Mar 2019 12:58:45 -0700 Subject: [PATCH 1/9] First commit for callhome integration on terraform --- Terraform/main.tf | 4 +++- Terraform/userdata.sh | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Terraform/main.tf b/Terraform/main.tf index b00b66e..da5b573 100644 --- a/Terraform/main.tf +++ b/Terraform/main.tf @@ -391,6 +391,7 @@ data "template_file" "init" { certificate_domain = "${var.certificate_domain}" artifactory_server_name = "${var.artifactory_server_name}" EXTRA_JAVA_OPTS = "${var.extra_java_options}" + ISPRIMARY = "true" } } @@ -420,7 +421,7 @@ resource "aws_launch_configuration" "secondary" { } data "template_file" "secondary_init" { - template = "${file("userdata_secondary.sh")}" + template = "${file("userdata.sh")}" vars = { s3_bucket_name = "${aws_s3_bucket.b.id}" @@ -443,5 +444,6 @@ data "template_file" "secondary_init" { certificate_domain = "${var.certificate_domain}" artifactory_server_name = "${var.artifactory_server_name}" EXTRA_JAVA_OPTS = "${var.extra_java_options}" + ISPRIMARY = "false" } } \ No newline at end of file diff --git a/Terraform/userdata.sh b/Terraform/userdata.sh index a0040c2..ed13dcb 100644 --- a/Terraform/userdata.sh +++ b/Terraform/userdata.sh @@ -84,7 +84,7 @@ cat </var/opt/jfrog/artifactory/etc/ha-node.properties context.url=http://127.0.0.1:8081/artifactory membership.port=10001 hazelcast.interface=172.25.0.3 - primary=true + primary=${ISPRIMARY} EOF cat </etc/pki/tls/certs/result.pem @@ -172,6 +172,12 @@ server { } EOF +cat < /var/opt/jfrog/artifactory/etc/info/installer-info.json +{ + "productId": "JFrogMysqlTerraformInstaller/1.0.0" +} +EOF + cat /etc/pki/tls/certs/result.pem | sed 's/CERTIFICATE----- /CERTIFICATE-----\n/g' | sed 's/-----END/\n-----END/' > temp.pem mv -f temp.pem /etc/pki/tls/certs/cert.pem cat /etc/pki/tls/private/result.key | sed 's/KEY----- /KEY-----\n/g' | sed 's/-----END/\n-----END/' > temp.key @@ -181,6 +187,6 @@ echo "export JAVA_OPTIONS=\"${EXTRA_JAVA_OPTS}\"" >> /var/opt/jfrog/artifactory/ 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/$(curl http://169.254.169.254/latest/meta-data/public-ipv4)/" /var/opt/jfrog/artifactory/etc/ha-node.properties sed -i -e "s/172.25.0.3/$(curl http://169.254.169.254/latest/meta-data/local-ipv4)/" /var/opt/jfrog/artifactory/etc/ha-node.properties -chown artifactory:artifactory -R /var/opt/jfrog/artifactory/etc/* && chown artifactory:artifactory -R /var/opt/jfrog/artifactory/* && chown artifactory:artifactory -R /var/opt/jfrog/artifactory/etc/security +chown artifactory:artifactory -R /var/opt/jfrog/artifactory/etc/* && chown artifactory:artifactory -R /var/opt/jfrog/artifactory/* && chown artifactory:artifactory -R /var/opt/jfrog/artifactory/etc/security service artifactory start service nginx start \ No newline at end of file From f501922c37a91689f675de86c3bbf05f20ac4635 Mon Sep 17 00:00:00 2001 From: brucec Date: Thu, 21 Mar 2019 14:19:32 -0700 Subject: [PATCH 2/9] Callhome installer info added to terraform --- Terraform/userdata.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Terraform/userdata.sh b/Terraform/userdata.sh index ed13dcb..77111e9 100644 --- a/Terraform/userdata.sh +++ b/Terraform/userdata.sh @@ -172,7 +172,8 @@ server { } EOF -cat < /var/opt/jfrog/artifactory/etc/info/installer-info.json +mkdir -p /var/opt/jfrog/artifactory/etc/info +cat </var/opt/jfrog/artifactory/etc/info/installer-info.json { "productId": "JFrogMysqlTerraformInstaller/1.0.0" } From 8ed6fc675064327e996b2ce195374f776b89945f Mon Sep 17 00:00:00 2001 From: brucec Date: Thu, 21 Mar 2019 16:49:09 -0700 Subject: [PATCH 3/9] 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 From 021f9a011eab9425905a4ec1c3c169d62480c1b2 Mon Sep 17 00:00:00 2001 From: brucec Date: Thu, 21 Mar 2019 16:57:39 -0700 Subject: [PATCH 4/9] Adding callhome metadata file for terraform, ARM and cloudformation --- CloudFormation/artifactory-enterprise.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CloudFormation/artifactory-enterprise.json b/CloudFormation/artifactory-enterprise.json index 34b2d7b..74d6b44 100644 --- a/CloudFormation/artifactory-enterprise.json +++ b/CloudFormation/artifactory-enterprise.json @@ -906,7 +906,7 @@ "/var/opt/jfrog/artifactory/etc/info/installer-info.json" : { "content" : { "Fn::Join" : ["", [ "{\n", - " \"productId\": \"JFrogInstaller_Azure_SQL/1.0.0\"\n", + " \"productId\": \"JFrogInstaller_Cloudformation_MySQL/1.0.0\"\n", "}\n" ]]}, "mode" : "000755", @@ -1268,7 +1268,7 @@ "/var/opt/jfrog/artifactory/etc/info/installer-info.json" : { "content" : { "Fn::Join" : ["", [ "{\n", - " \"productId\": \"JFrogInstaller_Azure_SQL/1.0.0\"\n", + " \"productId\": \"JFrogInstaller_Cloudformation_MySQL/1.0.0\"\n", "}\n" ]]}, "mode" : "000755", From 9d644f63023a59514f802ed8540f18fdc1afb173 Mon Sep 17 00:00:00 2001 From: brucec Date: Fri, 22 Mar 2019 11:40:32 -0700 Subject: [PATCH 5/9] Adding featureId into the installer-info.json --- AzureResourceManager/scripts/install_artifactory.sh | 5 +++++ CloudFormation/artifactory-enterprise.json | 5 +++++ Terraform/userdata.sh | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/AzureResourceManager/scripts/install_artifactory.sh b/AzureResourceManager/scripts/install_artifactory.sh index e703053..54f0e7e 100644 --- a/AzureResourceManager/scripts/install_artifactory.sh +++ b/AzureResourceManager/scripts/install_artifactory.sh @@ -215,6 +215,11 @@ 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" + "features": [ + { + "featureId": "Artifactory/${artifactoryVersion}", + "attributes": {} + } } EOF diff --git a/CloudFormation/artifactory-enterprise.json b/CloudFormation/artifactory-enterprise.json index 74d6b44..63ce4ab 100644 --- a/CloudFormation/artifactory-enterprise.json +++ b/CloudFormation/artifactory-enterprise.json @@ -907,6 +907,11 @@ "content" : { "Fn::Join" : ["", [ "{\n", " \"productId\": \"JFrogInstaller_Cloudformation_MySQL/1.0.0\"\n", + " \"features\": [\n", + " {\n", + " \"featureId\": \"Artifactory/", { "Ref": "ArtifactoryVersion" }, "\"\n", + " \"attributes\": {}\n", + " }\n", "}\n" ]]}, "mode" : "000755", diff --git a/Terraform/userdata.sh b/Terraform/userdata.sh index 277677a..af016b1 100644 --- a/Terraform/userdata.sh +++ b/Terraform/userdata.sh @@ -176,6 +176,11 @@ mkdir -p /var/opt/jfrog/artifactory/etc/info cat </var/opt/jfrog/artifactory/etc/info/installer-info.json { "productId": "JFrog_TerraformInstaller_Mysql/1.0.0" + "features": [ + { + "featureId": "Artifactory/${artifactory_version}", + "attributes": {} + } } EOF From c8e7ac7f3a4ea7b8b9cf6fe6d458eb288d2124e5 Mon Sep 17 00:00:00 2001 From: brucec Date: Fri, 22 Mar 2019 11:42:11 -0700 Subject: [PATCH 6/9] Rm userdata_secondary.sh to cleanup --- Terraform/userdata_secondary.sh | 190 -------------------------------- 1 file changed, 190 deletions(-) delete mode 100644 Terraform/userdata_secondary.sh diff --git a/Terraform/userdata_secondary.sh b/Terraform/userdata_secondary.sh deleted file mode 100644 index 024d069..0000000 --- a/Terraform/userdata_secondary.sh +++ /dev/null @@ -1,190 +0,0 @@ -#!/bin/bash - -yum update -y -yum install -y java-1.8.0>> /tmp/yum-java8.log -alternatives --set java /usr/lib/jvm/jre-1.8.0-openjdk.x86_64/bin/java -yum -y remove java-1.7.0-openjdk>> /tmp/yum-java7.log 2>&1 - -##Install Artifactory -wget https://bintray.com/jfrog/artifactory-pro-rpms/rpm -O bintray-jfrog-artifactory-pro-rpms.repo -mv bintray-jfrog-artifactory-pro-rpms.repo /etc/yum.repos.d/ -sleep 10 -yum install -y jfrog-artifactory-pro-${artifactory_version}>> /tmp/yum-artifactory.log 2>&1 -yum install -y nginx>> /tmp/yum-nginx.log 2>&1 -curl -L -o /opt/jfrog/artifactory/tomcat/lib/mysql-connector-java-5.1.38.jar https://bintray.com/artifact/download/bintray/jcenter/mysql/mysql-connector-java/5.1.38/mysql-connector-java-5.1.38.jar -openssl req -nodes -x509 -newkey rsa:4096 -keyout /etc/pki/tls/private/example.key -out /etc/pki/tls/certs/example.pem -days 356 -subj "/C=US/ST=California/L=SantaClara/O=IT/CN=*.localhost" - - -cat </var/opt/jfrog/artifactory/etc/binarystore.xml - - - - - - - - - - - - - - - - crossNetworkStrategy - crossNetworkStrategy - 2 - - - - - remote - - - - local - - - s3.dualstack.${s3_bucket_region}.amazonaws.com - ${s3_access_key} - ${s3_secret_key} - ${s3_bucket_name} - - -EOF - -cat </var/opt/jfrog/artifactory/etc/db.properties - type=mysql - driver=com.mysql.jdbc.Driver - url=jdbc:mysql://${db_url}/${db_name}??characterEncoding=UTF-8&elideSetAutoCommits=true - username=${db_user} - password=${db_password} -EOF - -mkdir -p /var/opt/jfrog/artifactory/etc/security - -cat </var/opt/jfrog/artifactory/etc/security/master.key -${master_key} -EOF - -cat </var/opt/jfrog/artifactory/etc/artifactory.cluster.license -${artifactory_license_1} - -${artifactory_license_2} - -${artifactory_license_3} - -${artifactory_license_4} - -${artifactory_license_5} -EOF - -cat </var/opt/jfrog/artifactory/etc/ha-node.properties - node.id=art1 - artifactory.ha.data.dir=/var/opt/jfrog/artifactory/data - context.url=http://127.0.0.1:8081/artifactory - membership.port=10001 - hazelcast.interface=172.25.0.3 - primary=false -EOF - -cat </etc/pki/tls/certs/result.pem -${ssl_certificate} -EOF - -cat </etc/pki/tls/private/result.key -${ssl_certificate_key} -EOF - -cat </etc/nginx/nginx.conf - #user nobody; - worker_processes 1; - error_log /var/log/nginx/error.log info; - #pid logs/nginx.pid; - events { - worker_connections 1024; - } - - http { - include mime.types; - variables_hash_max_size 1024; - variables_hash_bucket_size 64; - server_names_hash_max_size 4096; - server_names_hash_bucket_size 128; - types_hash_max_size 2048; - types_hash_bucket_size 64; - proxy_read_timeout 2400s; - client_header_timeout 2400s; - client_body_timeout 2400s; - proxy_connect_timeout 75s; - proxy_send_timeout 2400s; - proxy_buffer_size 32k; - proxy_buffers 40 32k; - proxy_busy_buffers_size 64k; - proxy_temp_file_write_size 250m; - proxy_http_version 1.1; - client_body_buffer_size 128k; - - include /etc/nginx/conf.d/*.conf; - default_type application/octet-stream; - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - access_log /var/log/nginx/access.log main; - sendfile on; - #tcp_nopush on; - #keepalive_timeout 0; - keepalive_timeout 65; - } -EOF - -cat </etc/nginx/conf.d/artifactory.conf -ssl_certificate /etc/pki/tls/certs/cert.pem; -ssl_certificate_key /etc/pki/tls/private/cert.key; -ssl_session_cache shared:SSL:1m; -ssl_prefer_server_ciphers on; -## server configuration -server { - listen 443 ssl; - listen 80 ; - server_name ~(?.+)\\.${certificate_domain} ${artifactory_server_name}.${certificate_domain}; - if (\$http_x_forwarded_proto = '') { - set \$http_x_forwarded_proto \$scheme; - } - ## Application specific logs - ## access_log /var/log/nginx/artifactory-access.log timing; - ## error_log /var/log/nginx/artifactory-error.log; - rewrite ^/$ /artifactory/webapp/ redirect; - rewrite ^/artifactory/?(/webapp)?$ /artifactory/webapp/ redirect; - rewrite ^/(v1|v2)/(.*) /artifactory/api/docker/\$repo/\$1/\$2; - chunked_transfer_encoding on; - client_max_body_size 0; - location /artifactory/ { - proxy_read_timeout 2400; - proxy_pass_header Server; - proxy_cookie_path ~*^/.* /; - proxy_pass http://127.0.0.1:8081/artifactory/; - proxy_set_header X-Artifactory-Override-Base-Url \$http_x_forwarded_proto://\$host:\$server_port/artifactory; - proxy_set_header X-Forwarded-Port \$server_port; - proxy_set_header X-Forwarded-Proto \$http_x_forwarded_proto; - proxy_set_header Host \$http_host; - proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; - } -} -EOF - -cat /etc/pki/tls/certs/result.pem | sed 's/CERTIFICATE----- /CERTIFICATE-----\n/g' | sed 's/-----END/\n-----END/' > temp.pem -mv -f temp.pem /etc/pki/tls/certs/cert.pem -cat /etc/pki/tls/private/result.key | sed 's/KEY----- /KEY-----\n/g' | sed 's/-----END/\n-----END/' > temp.key -mv -f temp.key /etc/pki/tls/private/cert.key -echo "artifactory.ping.allowUnauthenticated=true" >> /var/opt/jfrog/artifactory/etc/artifactory.system.properties -echo "export JAVA_OPTIONS=\"${EXTRA_JAVA_OPTS}\"" >> /var/opt/jfrog/artifactory/etc/default -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/$(curl http://169.254.169.254/latest/meta-data/public-ipv4)/" /var/opt/jfrog/artifactory/etc/ha-node.properties -sed -i -e "s/172.25.0.3/$(curl http://169.254.169.254/latest/meta-data/local-ipv4)/" /var/opt/jfrog/artifactory/etc/ha-node.properties -chown artifactory:artifactory -R /var/opt/jfrog/artifactory/etc/* && chown artifactory:artifactory -R /var/opt/jfrog/artifactory/* && chown artifactory:artifactory -R /var/opt/jfrog/artifactory/etc/security - -## Sleep 2 minute to avoid race condition -sleep 120 -service artifactory start -service nginx start \ No newline at end of file From 550b78b18dd99fb7fc27c65698cb0e1a54ad8ea3 Mon Sep 17 00:00:00 2001 From: brucec Date: Mon, 25 Mar 2019 12:06:40 -0700 Subject: [PATCH 7/9] Updated proper json for installers and version update for CF and TF --- AzureResourceManager/scripts/install_artifactory.sh | 3 +-- CloudFormation/artifactory-enterprise.json | 7 +++++-- Terraform/userdata.sh | 3 +-- Terraform/variables.tf | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/AzureResourceManager/scripts/install_artifactory.sh b/AzureResourceManager/scripts/install_artifactory.sh index 54f0e7e..3fc0b91 100644 --- a/AzureResourceManager/scripts/install_artifactory.sh +++ b/AzureResourceManager/scripts/install_artifactory.sh @@ -217,8 +217,7 @@ cat </var/opt/jfrog/artifactory/etc/info/installer-info.json "productId": "JFrogInstaller_Azure_SQL/1.0.0" "features": [ { - "featureId": "Artifactory/${artifactoryVersion}", - "attributes": {} + "featureId": "Artifactory/${artifactoryVersion}" } } EOF diff --git a/CloudFormation/artifactory-enterprise.json b/CloudFormation/artifactory-enterprise.json index 63ce4ab..80e5fa3 100644 --- a/CloudFormation/artifactory-enterprise.json +++ b/CloudFormation/artifactory-enterprise.json @@ -54,7 +54,7 @@ "ArtifactoryVersion": { "Description": "Artifactory version to deploy", "Type": "String", - "Default": "6.2.0" + "Default": "6.9.0" }, "ArtifactoryLicense1": { @@ -910,7 +910,6 @@ " \"features\": [\n", " {\n", " \"featureId\": \"Artifactory/", { "Ref": "ArtifactoryVersion" }, "\"\n", - " \"attributes\": {}\n", " }\n", "}\n" ]]}, @@ -1274,6 +1273,10 @@ "content" : { "Fn::Join" : ["", [ "{\n", " \"productId\": \"JFrogInstaller_Cloudformation_MySQL/1.0.0\"\n", + " \"features\": [\n", + " {\n", + " \"featureId\": \"Artifactory/", { "Ref": "ArtifactoryVersion" }, "\"\n", + " }\n", "}\n" ]]}, "mode" : "000755", diff --git a/Terraform/userdata.sh b/Terraform/userdata.sh index af016b1..551064f 100644 --- a/Terraform/userdata.sh +++ b/Terraform/userdata.sh @@ -178,8 +178,7 @@ cat </var/opt/jfrog/artifactory/etc/info/installer-info.json "productId": "JFrog_TerraformInstaller_Mysql/1.0.0" "features": [ { - "featureId": "Artifactory/${artifactory_version}", - "attributes": {} + "featureId": "Artifactory/${artifactory_version}" } } EOF diff --git a/Terraform/variables.tf b/Terraform/variables.tf index 42bd81b..13c460d 100644 --- a/Terraform/variables.tf +++ b/Terraform/variables.tf @@ -9,7 +9,7 @@ variable "key_name" { variable "artifactory_version" { description = "Artifactory version to deploy" - default = "6.2.0" + default = "6.9.0" } variable "artifactory_license_1" { From 5ed725f9c9849f7439416dbb18d7c6bc8e8be0d0 Mon Sep 17 00:00:00 2001 From: brucec Date: Mon, 25 Mar 2019 16:25:06 -0700 Subject: [PATCH 8/9] Shortened the productId --- AzureResourceManager/scripts/install_artifactory.sh | 4 ++-- CloudFormation/artifactory-enterprise.json | 6 +++--- Terraform/userdata.sh | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/AzureResourceManager/scripts/install_artifactory.sh b/AzureResourceManager/scripts/install_artifactory.sh index 3fc0b91..118ec68 100644 --- a/AzureResourceManager/scripts/install_artifactory.sh +++ b/AzureResourceManager/scripts/install_artifactory.sh @@ -214,10 +214,10 @@ EOF 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" + "productId": "JFrogInstaller_ARM/1.0.0" "features": [ { - "featureId": "Artifactory/${artifactoryVersion}" + "featureId": "SQLServer" } } EOF diff --git a/CloudFormation/artifactory-enterprise.json b/CloudFormation/artifactory-enterprise.json index 80e5fa3..f26f836 100644 --- a/CloudFormation/artifactory-enterprise.json +++ b/CloudFormation/artifactory-enterprise.json @@ -906,10 +906,10 @@ "/var/opt/jfrog/artifactory/etc/info/installer-info.json" : { "content" : { "Fn::Join" : ["", [ "{\n", - " \"productId\": \"JFrogInstaller_Cloudformation_MySQL/1.0.0\"\n", + " \"productId\": \"JFrogInstaller_Cloudformation/1.0.0\"\n", " \"features\": [\n", " {\n", - " \"featureId\": \"Artifactory/", { "Ref": "ArtifactoryVersion" }, "\"\n", + " \"featureId\": \"MySql/5.5\"\n", " }\n", "}\n" ]]}, @@ -1275,7 +1275,7 @@ " \"productId\": \"JFrogInstaller_Cloudformation_MySQL/1.0.0\"\n", " \"features\": [\n", " {\n", - " \"featureId\": \"Artifactory/", { "Ref": "ArtifactoryVersion" }, "\"\n", + " \"featureId\": \"MySql/5.5\"\n", " }\n", "}\n" ]]}, diff --git a/Terraform/userdata.sh b/Terraform/userdata.sh index 551064f..0e33ea0 100644 --- a/Terraform/userdata.sh +++ b/Terraform/userdata.sh @@ -175,10 +175,10 @@ EOF mkdir -p /var/opt/jfrog/artifactory/etc/info cat </var/opt/jfrog/artifactory/etc/info/installer-info.json { - "productId": "JFrog_TerraformInstaller_Mysql/1.0.0" + "productId": "JFrog_TerraformInstaller/1.0.0" "features": [ { - "featureId": "Artifactory/${artifactory_version}" + "featureId": "MySql/5.5" } } EOF From a5ca193769a053b9d8d42a5aa797ef9f15536132 Mon Sep 17 00:00:00 2001 From: brucec Date: Tue, 26 Mar 2019 15:57:57 -0700 Subject: [PATCH 9/9] Adding missed puncturations --- AzureResourceManager/scripts/install_artifactory.sh | 3 ++- CloudFormation/artifactory-enterprise.json | 8 ++++---- Terraform/userdata.sh | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/AzureResourceManager/scripts/install_artifactory.sh b/AzureResourceManager/scripts/install_artifactory.sh index 118ec68..2ed2f3d 100644 --- a/AzureResourceManager/scripts/install_artifactory.sh +++ b/AzureResourceManager/scripts/install_artifactory.sh @@ -214,11 +214,12 @@ EOF mkdir -p /var/opt/jfrog/artifactory/etc/info cat </var/opt/jfrog/artifactory/etc/info/installer-info.json { - "productId": "JFrogInstaller_ARM/1.0.0" + "productId": "JFrogInstaller_ARM/1.0.0", "features": [ { "featureId": "SQLServer" } + ] } EOF diff --git a/CloudFormation/artifactory-enterprise.json b/CloudFormation/artifactory-enterprise.json index f26f836..1c73880 100644 --- a/CloudFormation/artifactory-enterprise.json +++ b/CloudFormation/artifactory-enterprise.json @@ -906,11 +906,11 @@ "/var/opt/jfrog/artifactory/etc/info/installer-info.json" : { "content" : { "Fn::Join" : ["", [ "{\n", - " \"productId\": \"JFrogInstaller_Cloudformation/1.0.0\"\n", + " \"productId\": \"JFrogInstaller_Cloudformation/1.0.0\",\n", " \"features\": [\n", " {\n", " \"featureId\": \"MySql/5.5\"\n", - " }\n", + " }]\n", "}\n" ]]}, "mode" : "000755", @@ -1272,11 +1272,11 @@ "/var/opt/jfrog/artifactory/etc/info/installer-info.json" : { "content" : { "Fn::Join" : ["", [ "{\n", - " \"productId\": \"JFrogInstaller_Cloudformation_MySQL/1.0.0\"\n", + " \"productId\": \"JFrogInstaller_Cloudformation_MySQL/1.0.0\",\n", " \"features\": [\n", " {\n", " \"featureId\": \"MySql/5.5\"\n", - " }\n", + " }]\n", "}\n" ]]}, "mode" : "000755", diff --git a/Terraform/userdata.sh b/Terraform/userdata.sh index 0e33ea0..28a8262 100644 --- a/Terraform/userdata.sh +++ b/Terraform/userdata.sh @@ -175,11 +175,12 @@ EOF mkdir -p /var/opt/jfrog/artifactory/etc/info cat </var/opt/jfrog/artifactory/etc/info/installer-info.json { - "productId": "JFrog_TerraformInstaller/1.0.0" + "productId": "JFrog_TerraformInstaller/1.0.0", "features": [ { "featureId": "MySql/5.5" } + ] } EOF