add missing closing bracket in controllerconfig.json and add logic on tikaVmIP variable

azuredeploy.json

@@ -927,7 +927,7 @@
             "tikaNicName": "[concat('tika-vm-nic-',variables('resourceprefix'))]",
             "tikaScriptFilename": "install_tika.sh",
             "tikaService": "[parameters('tikaService')]",
-            "tikaVmIP": "[concat( variables('octets')[0], '.', variables('octets')[1], '.', string(add(int(variables('octets')[2]),5)), '.20')]",
+            "tikaVmIP": "[if(equals(parameters('tikaService'), 'tika'), concat( variables('octets')[0], '.', variables('octets')[1], '.', string(add(int(variables('octets')[2]),5)), '.20'), 'none')]",
             "tikaVmName": "[concat('tika-vm-',variables('resourceprefix'))]",
             "tikaVmSku": "[parameters('tikaVmSku')]",
             "vNetAddressSpace": "[parameters('vNetAddressSpace')]",

nested/controllerconfig.json

@@ -37,7 +37,7 @@
                     ]
                 },
                 "protectedSettings":{
-                    "commandToExecute": "[concat('bash ', parameters('moodleCommon').moodleInstallScriptFilename, ' ', parameters('moodleCommon').moodleVersion, ' ', concat(parameters('moodleCommon').gfsNameRoot, '0'), ' ', 'data', ' ', parameters('moodleCommon').siteURL, ' ', parameters('moodleCommon').httpsTermination, ' ', parameters('moodleCommon').dbDNS, ' ', parameters('moodleCommon').moodleDbName, ' ', parameters('moodleCommon').moodleDbUser, ' ', parameters('moodleCommon').moodleDbPass, ' ', parameters('moodleCommon').moodleAdminPass, ' ', concat(parameters('moodleCommon').dbLogin, '@', parameters('moodleCommon').dbServerType, '-', parameters('moodleCommon').resourcesPrefix), ' ', parameters('moodleCommon').dbLoginPassword, ' ', parameters('moodleCommon').storageAccountName, ' ', listKeys(variables('storageAccountId'), '2017-06-01').keys[0].value, ' ', parameters('moodleCommon').moodleDbUserAzure, ' ', parameters('moodleCommon').redisDns, ' ', parameters('redisKey'), ' ', parameters('moodleCommon').elasticVm1IP, ' ', parameters('moodleCommon').installO365pluginsSwitch, ' ', parameters('moodleCommon').dbServerType, ' ', parameters('moodleCommon').fileServerType , ' ', parameters('moodleCommon').mssqlDbServiceObjectiveName, ' ',  parameters('moodleCommon').mssqlDbEdition, ' ',  parameters('moodleCommon').mssqlDbSize, ' ', parameters('moodleCommon').installObjectFsSwitch, ' ', parameters('moodleCommon').installGdprPluginsSwitch, ' ', parameters('moodleCommon').thumbprintSslCert, ' ', parameters('moodleCommon').thumbprintCaCert, ' ', parameters('moodleCommon').searchType, ' ', parameters('azureSearchKey'), ' ', parameters('moodleCommon').azureSearchNameHost, ' ', parameters('moodleCommon').tikaVmIP)"
+                    "commandToExecute": "[concat('bash ', parameters('moodleCommon').moodleInstallScriptFilename, ' ', parameters('moodleCommon').moodleVersion, ' ', concat(parameters('moodleCommon').gfsNameRoot, '0'), ' ', 'data', ' ', parameters('moodleCommon').siteURL, ' ', parameters('moodleCommon').httpsTermination, ' ', parameters('moodleCommon').dbDNS, ' ', parameters('moodleCommon').moodleDbName, ' ', parameters('moodleCommon').moodleDbUser, ' ', parameters('moodleCommon').moodleDbPass, ' ', parameters('moodleCommon').moodleAdminPass, ' ', concat(parameters('moodleCommon').dbLogin, '@', parameters('moodleCommon').dbServerType, '-', parameters('moodleCommon').resourcesPrefix), ' ', parameters('moodleCommon').dbLoginPassword, ' ', parameters('moodleCommon').storageAccountName, ' ', listKeys(variables('storageAccountId'), '2017-06-01').keys[0].value, ' ', parameters('moodleCommon').moodleDbUserAzure, ' ', parameters('moodleCommon').redisDns, ' ', parameters('redisKey'), ' ', parameters('moodleCommon').elasticVm1IP, ' ', parameters('moodleCommon').installO365pluginsSwitch, ' ', parameters('moodleCommon').dbServerType, ' ', parameters('moodleCommon').fileServerType , ' ', parameters('moodleCommon').mssqlDbServiceObjectiveName, ' ',  parameters('moodleCommon').mssqlDbEdition, ' ',  parameters('moodleCommon').mssqlDbSize, ' ', parameters('moodleCommon').installObjectFsSwitch, ' ', parameters('moodleCommon').installGdprPluginsSwitch, ' ', parameters('moodleCommon').thumbprintSslCert, ' ', parameters('moodleCommon').thumbprintCaCert, ' ', parameters('moodleCommon').searchType, ' ', parameters('azureSearchKey'), ' ', parameters('moodleCommon').azureSearchNameHost, ' ', parameters('moodleCommon').tikaVmIP)]"
                 },
                 "type": "CustomScript",
                 "typeHandlerVersion": "2.0"