From a00ddda2dcb741fd247b44493ce34433968ef562 Mon Sep 17 00:00:00 2001 From: Daniel Miakotkin <55418063+danielmkn@users.noreply.github.com> Date: Fri, 9 Oct 2020 13:56:29 -0700 Subject: [PATCH] ARM template bug fixes and improvements (#49) * ARM templates - nginx.config file, $ sign escaped in the config * ARM templates - storage size increase for the Postgresql (Xray and Artifactory), Callhome data - different callhome file will indicate, if VM image is used with the template --- .../MP_submission/nested/Postgresql_deploy.json | 2 +- .../scripts/install_artifactory7.sh | 6 +++--- .../Artifactory/nested/Postgresql_deploy.json | 2 +- .../Artifactory/scripts/install_artifactory7.sh | 17 ++++++++++++++--- .../vm_install/install_pro7_to_vm.sh | 2 +- .../scripts/install_artifactory7.sh | 6 +++--- .../JCR/scripts/install_artifactory7.sh | 6 +++--- .../Postgresql/azurePostgresDBDeploy.json | 2 +- 8 files changed, 27 insertions(+), 16 deletions(-) diff --git a/AzureResourceManager/Artifactory/MP_submission/nested/Postgresql_deploy.json b/AzureResourceManager/Artifactory/MP_submission/nested/Postgresql_deploy.json index 464ebd5..064f77d 100644 --- a/AzureResourceManager/Artifactory/MP_submission/nested/Postgresql_deploy.json +++ b/AzureResourceManager/Artifactory/MP_submission/nested/Postgresql_deploy.json @@ -37,7 +37,7 @@ }, "skuSizeMB": { "type": "int", - "defaultValue": 5120 + "defaultValue": 102400 }, "skuTier": { "type": "string", diff --git a/AzureResourceManager/Artifactory/MP_submission/scripts/install_artifactory7.sh b/AzureResourceManager/Artifactory/MP_submission/scripts/install_artifactory7.sh index 75bf714..b292514 100644 --- a/AzureResourceManager/Artifactory/MP_submission/scripts/install_artifactory7.sh +++ b/AzureResourceManager/Artifactory/MP_submission/scripts/install_artifactory7.sh @@ -68,9 +68,9 @@ cat </etc/nginx/nginx.conf 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"'; + 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; diff --git a/AzureResourceManager/Artifactory/nested/Postgresql_deploy.json b/AzureResourceManager/Artifactory/nested/Postgresql_deploy.json index 464ebd5..064f77d 100644 --- a/AzureResourceManager/Artifactory/nested/Postgresql_deploy.json +++ b/AzureResourceManager/Artifactory/nested/Postgresql_deploy.json @@ -37,7 +37,7 @@ }, "skuSizeMB": { "type": "int", - "defaultValue": 5120 + "defaultValue": 102400 }, "skuTier": { "type": "string", diff --git a/AzureResourceManager/Artifactory/scripts/install_artifactory7.sh b/AzureResourceManager/Artifactory/scripts/install_artifactory7.sh index 75bf714..115fccf 100644 --- a/AzureResourceManager/Artifactory/scripts/install_artifactory7.sh +++ b/AzureResourceManager/Artifactory/scripts/install_artifactory7.sh @@ -68,9 +68,9 @@ cat </etc/nginx/nginx.conf 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"'; + 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; @@ -256,6 +256,17 @@ 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 +{ + "productId": "ARM_artifactory-pro-template/1.0.0", + "features": [ + { + "featureId": "Partner/ACC-007221" + } + ] +} +EOF + 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/* # start Artifactory diff --git a/AzureResourceManager/Artifactory/vm_install/install_pro7_to_vm.sh b/AzureResourceManager/Artifactory/vm_install/install_pro7_to_vm.sh index 7900216..b08338b 100644 --- a/AzureResourceManager/Artifactory/vm_install/install_pro7_to_vm.sh +++ b/AzureResourceManager/Artifactory/vm_install/install_pro7_to_vm.sh @@ -25,7 +25,7 @@ apt-get -y install jfrog-artifactory-pro=${ARTIFACTORY_VERSION} >> /tmp/install- mkdir -p /var/opt/jfrog/artifactory/etc/info cat </var/opt/jfrog/artifactory/etc/info/installer-info.json { - "productId": "ARM_artifactory-pro/1.0.0", + "productId": "ARM_artifactory-pro-vm/1.0.0", "features": [ { "featureId": "Partner/ACC-007221" diff --git a/AzureResourceManager/JCR/MP_submission_7/scripts/install_artifactory7.sh b/AzureResourceManager/JCR/MP_submission_7/scripts/install_artifactory7.sh index 77a62b7..9884bae 100644 --- a/AzureResourceManager/JCR/MP_submission_7/scripts/install_artifactory7.sh +++ b/AzureResourceManager/JCR/MP_submission_7/scripts/install_artifactory7.sh @@ -57,9 +57,9 @@ cat </etc/nginx/nginx.conf 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"'; + 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; diff --git a/AzureResourceManager/JCR/scripts/install_artifactory7.sh b/AzureResourceManager/JCR/scripts/install_artifactory7.sh index 77a62b7..9884bae 100644 --- a/AzureResourceManager/JCR/scripts/install_artifactory7.sh +++ b/AzureResourceManager/JCR/scripts/install_artifactory7.sh @@ -57,9 +57,9 @@ cat </etc/nginx/nginx.conf 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"'; + 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; diff --git a/AzureResourceManager/Postgresql/azurePostgresDBDeploy.json b/AzureResourceManager/Postgresql/azurePostgresDBDeploy.json index b06316e..c290f3a 100644 --- a/AzureResourceManager/Postgresql/azurePostgresDBDeploy.json +++ b/AzureResourceManager/Postgresql/azurePostgresDBDeploy.json @@ -38,7 +38,7 @@ }, "skuSizeMB": { "type": "int", - "defaultValue": 5120 + "defaultValue": 204800 }, "skuTier": { "type": "string",