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

Azure xray 3.8.5 (#42)

Browse Source 
* ARM templates - Xray config script, added value to support Azure Postgres service

* ARM templates - Xray 3.8.5

* ARM templates - Xray, fixed bug in MP submission, removed Postgres workaround from README.md
This commit is contained in:
Daniel Miakotkin
2020-09-21 13:26:57 -07:00
committed by GitHub
parent e9ae5345e4
commit b2d8fe15d7
7 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AzureResourceManager/Xray/MP_submission/mainTemplate.json
View File

@@ -19,10 +19,11 @@
},
"xrayVersion": {
"type": "string",
"defaultValue": "0.0.4",
"defaultValue": "0.0.5",
"allowedValues": [
"0.0.3",
"0.0.4"
"0.0.4",
"0.0.5"
],
"metadata": {
"description": "Xray-vm image version to deploy."
@@ -182,6 +183,7 @@
"publicIPAddressType": "Dynamic",
"db_server": "[parameters('db_server')]",
"db_user": "[concat(parameters('db_user'), '@', parameters('db_server'))]",
"actual_db_user": "[parameters('db_user')]",
"db_password": "[parameters('db_password')]",
"db_location": "[parameters('location')]",
"db_name": "[parameters('databases').properties[0].name]",
@@ -351,7 +353,7 @@
"computerNamePrefix": "[variables('namingInfix')]",
"adminUsername": "[parameters('adminUsername')]",
"adminPassword": "[parameters('adminPassword')]",
"customData": "[base64(concat('#INSTALL SCRIPT INPUTS\nXRAY_VERSION=', parameters('xrayVersion'),'\nARTIFACTORY_URL=',variables('artifactoryURL'),'\nDB_SERVER=',variables('db_server'),'\nDB_NAME=',variables('db_name'),'\nDB_ADMIN_USER=',variables('db_user'),'\nDB_ADMIN_PASSWD=',variables('db_password'),'\nMASTER_KEY=',variables('masterKey'),'\nJOIN_KEY=',variables('joinKey'),'\n'))]"
"customData": "[base64(concat('#INSTALL SCRIPT INPUTS\nXRAY_VERSION=', parameters('xrayVersion'),'\nARTIFACTORY_URL=',variables('artifactoryURL'),'\nDB_SERVER=',variables('db_server'),'\nDB_NAME=',variables('db_name'),'\nDB_ADMIN_USER=',variables('db_user'),'\nACTUAL_DB_ADMIN_USER=',variables('actual_db_user'),'\nDB_ADMIN_PASSWD=',variables('db_password'),'\nMASTER_KEY=',variables('masterKey'),'\nJOIN_KEY=',variables('joinKey'),'\n'))]"
},
"networkProfile": {
"networkInterfaceConfigurations": [