zware/JFrog-Cloud-Installers
1
0
Fork 0
mirror of https://github.com/ZwareBear/JFrog-Cloud-Installers.git synced 2026-01-21 03:06:57 -06:00
Code Issues Packages Projects Releases Wiki Activity

ARM template bug fixes and improvements (#49)

Browse Source 
* 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
This commit is contained in:
Daniel Miakotkin
2020-10-09 13:56:29 -07:00
committed by GitHub
parent b31e69bc77
commit a00ddda2dc
8 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AzureResourceManager/Artifactory/MP_submission/nested/Postgresql_deploy.json
View File

@@ -37,7 +37,7 @@
}, },
"skuSizeMB": { "skuSizeMB": {
"type": "int", "type": "int",
"defaultValue": 5120 "defaultValue": 102400
}, },
"skuTier": { "skuTier": {
"type": "string", "type": "string",

6
AzureResourceManager/Artifactory/MP_submission/scripts/install_artifactory7.sh
View File

@@ -68,9 +68,9 @@ cat <<EOF >/etc/nginx/nginx.conf
include /etc/nginx/conf.d/*.conf; include /etc/nginx/conf.d/*.conf;
default_type application/octet-stream; default_type application/octet-stream;
log_format main '$remote_addr - $remote_user [$time_local] "$request" ' log_format main '\$remote_addr - \$remote_user [\$time_local] "\$request" '
'$status $body_bytes_sent "$http_referer" ' '\$status \$body_bytes_sent "\$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"'; '"\$http_user_agent" "\$http_x_forwarded_for"';
access_log /var/log/nginx/access.log main; access_log /var/log/nginx/access.log main;
sendfile on; sendfile on;
#tcp_nopush on; #tcp_nopush on;

2
AzureResourceManager/Artifactory/nested/Postgresql_deploy.json
View File

@@ -37,7 +37,7 @@
}, },
"skuSizeMB": { "skuSizeMB": {
"type": "int", "type": "int",
"defaultValue": 5120 "defaultValue": 102400
}, },
"skuTier": { "skuTier": {
"type": "string", "type": "string",

17
AzureResourceManager/Artifactory/scripts/install_artifactory7.sh
View File

@@ -68,9 +68,9 @@ cat <<EOF >/etc/nginx/nginx.conf
include /etc/nginx/conf.d/*.conf; include /etc/nginx/conf.d/*.conf;
default_type application/octet-stream; default_type application/octet-stream;
log_format main '$remote_addr - $remote_user [$time_local] "$request" ' log_format main '\$remote_addr - \$remote_user [\$time_local] "\$request" '
'$status $body_bytes_sent "$http_referer" ' '\$status \$body_bytes_sent "\$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"'; '"\$http_user_agent" "\$http_x_forwarded_for"';
access_log /var/log/nginx/access.log main; access_log /var/log/nginx/access.log main;
sendfile on; sendfile on;
#tcp_nopush 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 rm /tmp/temp.key
fi fi
cat <<EOF >/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/* 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 # start Artifactory

2
AzureResourceManager/Artifactory/vm_install/install_pro7_to_vm.sh
View File

@@ -25,7 +25,7 @@ apt-get -y install jfrog-artifactory-pro=${ARTIFACTORY_VERSION} >> /tmp/install-
mkdir -p /var/opt/jfrog/artifactory/etc/info mkdir -p /var/opt/jfrog/artifactory/etc/info
cat <<EOF >/var/opt/jfrog/artifactory/etc/info/installer-info.json cat <<EOF >/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": [ "features": [
{ {
"featureId": "Partner/ACC-007221" "featureId": "Partner/ACC-007221"

6
AzureResourceManager/JCR/MP_submission_7/scripts/install_artifactory7.sh
View File

@@ -57,9 +57,9 @@ cat <<EOF >/etc/nginx/nginx.conf
include /etc/nginx/conf.d/*.conf; include /etc/nginx/conf.d/*.conf;
default_type application/octet-stream; default_type application/octet-stream;
log_format main '$remote_addr - $remote_user [$time_local] "$request" ' log_format main '\$remote_addr - \$remote_user [\$time_local] "\$request" '
'$status $body_bytes_sent "$http_referer" ' '\$status \$body_bytes_sent "\$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"'; '"\$http_user_agent" "\$http_x_forwarded_for"';
access_log /var/log/nginx/access.log main; access_log /var/log/nginx/access.log main;
sendfile on; sendfile on;
#tcp_nopush on; #tcp_nopush on;

6
AzureResourceManager/JCR/scripts/install_artifactory7.sh
View File

@@ -57,9 +57,9 @@ cat <<EOF >/etc/nginx/nginx.conf
include /etc/nginx/conf.d/*.conf; include /etc/nginx/conf.d/*.conf;
default_type application/octet-stream; default_type application/octet-stream;
log_format main '$remote_addr - $remote_user [$time_local] "$request" ' log_format main '\$remote_addr - \$remote_user [\$time_local] "\$request" '
'$status $body_bytes_sent "$http_referer" ' '\$status \$body_bytes_sent "\$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"'; '"\$http_user_agent" "\$http_x_forwarded_for"';
access_log /var/log/nginx/access.log main; access_log /var/log/nginx/access.log main;
sendfile on; sendfile on;
#tcp_nopush on; #tcp_nopush on;

2
AzureResourceManager/Postgresql/azurePostgresDBDeploy.json
View File

@@ -38,7 +38,7 @@
}, },
"skuSizeMB": { "skuSizeMB": {
"type": "int", "type": "int",
"defaultValue": 5120 "defaultValue": 204800
}, },
"skuTier": { "skuTier": {
"type": "string", "type": "string",